Code Modernization: Address no-op function deprecations in PHP 8.5.

Several PHP functions that have not been doing anything since PHP 8.0/8.1, specifically:

* `finfo_close()` since the `ext/fileinfo` migration in PHP 8.1
* `xml_parser_free()` since the `ext/xml` migration in PHP 8.0
* `curl_close()` since the `ext/curl` migration in PHP 8.0
* `curl_share_close()` since the `ext/curl` migration in PHP 8.0
* `imagedestroy()` since the `ext/gd` migration in PHP 8.0

will be deprecated in PHP 8.5 and will thus be throwing warnings.

This commit adds conditional checks to only call these functions on the relevant PHP versions.

Reference: [https://wiki.php.net/rfc/deprecations_php_8_5#deprecate_no-op_functions_from_the_resource_to_object_conversion PHP RFC: Deprecations for PHP 8.5: Deprecate no-op functions from the resource to object conversion].

Props TobiasBg, SergeyBiryukov.
See #63061.

git-svn-id: https://develop.svn.wordpress.org/trunk@60703 602fd350-edb4-49c9-b593-d223f7449a82

Author: SergeyBiryukov

src/wp-admin/includes/image-edit.php

@@ -545,7 +545,10 @@ function _rotate_image_resource( $img, $angle ) {
 		$rotated = imagerotate( $img, $angle, 0 );
 
 		if ( is_gd_image( $rotated ) ) {
-			imagedestroy( $img );
+			if ( PHP_VERSION_ID < 80000 ) { // imagedestroy() has no effect as of PHP 8.0.
+				imagedestroy( $img );
+			}
+
 			$img = $rotated;
 		}
 	}
@@ -580,7 +583,10 @@ function _flip_image_resource( $img, $horz, $vert ) {
 		$sh = $horz ? -$h : $h;
 
 		if ( imagecopyresampled( $dst, $img, 0, 0, $sx, $sy, $w, $h, $sw, $sh ) ) {
-			imagedestroy( $img );
+			if ( PHP_VERSION_ID < 80000 ) { // imagedestroy() has no effect as of PHP 8.0.
+				imagedestroy( $img );
+			}
+
 			$img = $dst;
 		}
 	}
@@ -606,7 +612,10 @@ function _crop_image_resource( $img, $x, $y, $w, $h ) {
 
 	if ( is_gd_image( $dst ) ) {
 		if ( imagecopy( $dst, $img, 0, 0, $x, $y, $w, $h ) ) {
-			imagedestroy( $img );
+			if ( PHP_VERSION_ID < 80000 ) { // imagedestroy() has no effect as of PHP 8.0.
+				imagedestroy( $img );
+			}
+
 			$img = $dst;
 		}
 	}

src/wp-admin/link-parse-opml.php

@@ -96,6 +96,9 @@ function endElement( $parser, $tag_name ) { // phpcs:ignore WordPress.NamingConv
 	);
 }
 
-// Free up memory used by the XML parser.
-xml_parser_free( $xml_parser );
+if ( PHP_VERSION_ID < 80000 ) { // xml_parser_free() has no effect as of PHP 8.0.
+	// Free up memory used by the XML parser.
+	xml_parser_free( $xml_parser );
+}
+
 unset( $xml_parser );

src/wp-includes/IXR/class-IXR-message.php

@@ -119,7 +119,10 @@ function parse()
             $this->message = substr($this->message, $chunk_size);
 
             if (!xml_parse($this->_parser, $part, $final)) {
-                xml_parser_free($this->_parser);
+                if (PHP_VERSION_ID < 80000) { // xml_parser_free() has no effect as of PHP 8.0.
+                    xml_parser_free($this->_parser);
+                }
+
                 unset($this->_parser);
                 return false;
             }
@@ -129,7 +132,10 @@ function parse()
             }
         } while (true);
 
-        xml_parser_free($this->_parser);
+        if (PHP_VERSION_ID < 80000) { // xml_parser_free() has no effect as of PHP 8.0.
+            xml_parser_free($this->_parser);
+        }
+
         unset($this->_parser);
 
         // Grab the error messages, if any

src/wp-includes/atomlib.php

@@ -184,7 +184,10 @@ function parse() {
         }
         fclose($fp);
 
-        xml_parser_free($parser);
+        if (PHP_VERSION_ID < 80000) { // xml_parser_free() has no effect as of PHP 8.0.
+            xml_parser_free($parser);
+        }
+
         unset($parser);
 
         restore_error_handler();

src/wp-includes/class-wp-http-curl.php

@@ -240,16 +240,27 @@ public function request( $url, $args = array() ) {
 			curl_exec( $handle );
 
 			$curl_error = curl_error( $handle );
+
 			if ( $curl_error ) {
-				curl_close( $handle );
+				if ( PHP_VERSION_ID < 80000 ) { // curl_close() has no effect as of PHP 8.0.
+					curl_close( $handle );
+				}
+
 				return new WP_Error( 'http_request_failed', $curl_error );
 			}
+
 			if ( in_array( curl_getinfo( $handle, CURLINFO_HTTP_CODE ), array( 301, 302 ), true ) ) {
-				curl_close( $handle );
+				if ( PHP_VERSION_ID < 80000 ) { // curl_close() has no effect as of PHP 8.0.
+					curl_close( $handle );
+				}
+
 				return new WP_Error( 'http_request_failed', __( 'Too many redirects.' ) );
 			}
 
-			curl_close( $handle );
+			if ( PHP_VERSION_ID < 80000 ) { // curl_close() has no effect as of PHP 8.0.
+				curl_close( $handle );
+			}
+
 			return array(
 				'headers'  => array(),
 				'body'     => '',
@@ -278,28 +289,45 @@ public function request( $url, $args = array() ) {
 			if ( CURLE_WRITE_ERROR /* 23 */ === $curl_error ) {
 				if ( ! $this->max_body_length || $this->max_body_length !== $bytes_written_total ) {
 					if ( $parsed_args['stream'] ) {
-						curl_close( $handle );
+						if ( PHP_VERSION_ID < 80000 ) { // curl_close() has no effect as of PHP 8.0.
+							curl_close( $handle );
+						}
+
 						fclose( $this->stream_handle );
+
 						return new WP_Error( 'http_request_failed', __( 'Failed to write request to temporary file.' ) );
 					} else {
-						curl_close( $handle );
+						if ( PHP_VERSION_ID < 80000 ) { // curl_close() has no effect as of PHP 8.0.
+							curl_close( $handle );
+						}
+
 						return new WP_Error( 'http_request_failed', curl_error( $handle ) );
 					}
 				}
 			} else {
 				$curl_error = curl_error( $handle );
+
 				if ( $curl_error ) {
-					curl_close( $handle );
+					if ( PHP_VERSION_ID < 80000 ) { // curl_close() has no effect as of PHP 8.0.
+						curl_close( $handle );
+					}
+
 					return new WP_Error( 'http_request_failed', $curl_error );
 				}
 			}
+
 			if ( in_array( curl_getinfo( $handle, CURLINFO_HTTP_CODE ), array( 301, 302 ), true ) ) {
-				curl_close( $handle );
+				if ( PHP_VERSION_ID < 80000 ) { // curl_close() has no effect as of PHP 8.0.
+					curl_close( $handle );
+				}
+
 				return new WP_Error( 'http_request_failed', __( 'Too many redirects.' ) );
 			}
 		}
 
-		curl_close( $handle );
+		if ( PHP_VERSION_ID < 80000 ) { // curl_close() has no effect as of PHP 8.0.
+			curl_close( $handle );
+		}
 
 		if ( $parsed_args['stream'] ) {
 			fclose( $this->stream_handle );

src/wp-includes/class-wp-image-editor-gd.php

@@ -23,8 +23,10 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 
 	public function __destruct() {
 		if ( $this->image ) {
-			// We don't need the original in memory anymore.
-			imagedestroy( $this->image );
+			if ( PHP_VERSION_ID < 80000 ) { // imagedestroy() has no effect as of PHP 8.0.
+				// We don't need the original in memory anymore.
+				imagedestroy( $this->image );
+			}
 		}
 	}
 
@@ -188,8 +190,12 @@ public function resize( $max_w, $max_h, $crop = false ) {
 		$resized = $this->_resize( $max_w, $max_h, $crop );
 
 		if ( is_gd_image( $resized ) ) {
-			imagedestroy( $this->image );
+			if ( PHP_VERSION_ID < 80000 ) { // imagedestroy() has no effect as of PHP 8.0.
+				imagedestroy( $this->image );
+			}
+
 			$this->image = $resized;
+
 			return true;
 
 		} elseif ( is_wp_error( $resized ) ) {
@@ -324,7 +330,10 @@ public function make_subsize( $size_data ) {
 			$saved = $resized;
 		} else {
 			$saved = $this->_save( $resized );
-			imagedestroy( $resized );
+
+			if ( PHP_VERSION_ID < 80000 ) { // imagedestroy() has no effect as of PHP 8.0.
+				imagedestroy( $resized );
+			}
 		}
 
 		$this->size = $orig_size;
@@ -382,9 +391,13 @@ public function crop( $src_x, $src_y, $src_w, $src_h, $dst_w = null, $dst_h = nu
 		imagecopyresampled( $dst, $this->image, 0, 0, (int) $src_x, (int) $src_y, (int) $dst_w, (int) $dst_h, (int) $src_w, (int) $src_h );
 
 		if ( is_gd_image( $dst ) ) {
-			imagedestroy( $this->image );
+			if ( PHP_VERSION_ID < 80000 ) { // imagedestroy() has no effect as of PHP 8.0.
+				imagedestroy( $this->image );
+			}
+
 			$this->image = $dst;
 			$this->update_size();
+
 			return true;
 		}
 
@@ -408,9 +421,14 @@ public function rotate( $angle ) {
 			if ( is_gd_image( $rotated ) ) {
 				imagealphablending( $rotated, true );
 				imagesavealpha( $rotated, true );
-				imagedestroy( $this->image );
+
+				if ( PHP_VERSION_ID < 80000 ) { // imagedestroy() has no effect as of PHP 8.0.
+					imagedestroy( $this->image );
+				}
+
 				$this->image = $rotated;
 				$this->update_size();
+
 				return true;
 			}
 		}
@@ -439,8 +457,12 @@ public function flip( $horz, $vert ) {
 			$sh = $horz ? -$h : $h;
 
 			if ( imagecopyresampled( $dst, $this->image, 0, 0, $sx, $sy, $w, $h, $sw, $sh ) ) {
-				imagedestroy( $this->image );
+				if ( PHP_VERSION_ID < 80000 ) { // imagedestroy() has no effect as of PHP 8.0.
+					imagedestroy( $this->image );
+				}
+
 				$this->image = $dst;
+
 				return true;
 			}
 		}

src/wp-includes/feed.php

@@ -599,7 +599,11 @@ function prep_atom_text_construct( $data ) {
 	$parser = xml_parser_create();
 	xml_parse( $parser, '<div>' . $data . '</div>', true );
 	$code = xml_get_error_code( $parser );
-	xml_parser_free( $parser );
+
+	if ( PHP_VERSION_ID < 80000 ) { // xml_parser_free() has no effect as of PHP 8.0.
+		xml_parser_free( $parser );
+	}
+
 	unset( $parser );
 
 	if ( ! $code ) {

src/wp-includes/functions.php

@@ -3172,7 +3172,10 @@ function wp_check_filetype_and_ext( $file, $filename, $mimes = null ) {
 	if ( $type && ! $real_mime && extension_loaded( 'fileinfo' ) ) {
 		$finfo     = finfo_open( FILEINFO_MIME_TYPE );
 		$real_mime = finfo_file( $finfo, $file );
-		finfo_close( $finfo );
+
+		if ( PHP_VERSION_ID < 80100 ) { // finfo_close() has no effect as of PHP 8.1.
+			finfo_close( $finfo );
+		}
 
 		$google_docs_types = array(
 			'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
@@ -3401,7 +3404,10 @@ function wp_get_image_mime( $file ) {
 				if ( extension_loaded( 'fileinfo' ) ) {
 					$fileinfo  = finfo_open( FILEINFO_MIME_TYPE );
 					$mime_type = finfo_file( $fileinfo, $file );
-					finfo_close( $fileinfo );
+
+					if ( PHP_VERSION_ID < 80100 ) { // finfo_close() has no effect as of PHP 8.1.
+						finfo_close( $fileinfo );
+					}
 
 					if ( wp_is_heic_image_mime_type( $mime_type ) ) {
 						$mime = $mime_type;

src/wp-includes/rss.php

@@ -93,7 +93,10 @@ function __construct( $source ) {
 			}
 		}
 
-		xml_parser_free( $this->parser );
+		if ( PHP_VERSION_ID < 80000 ) { // xml_parser_free() has no effect as of PHP 8.0.
+			xml_parser_free( $this->parser );
+		}
+
 		unset( $this->parser );
 
 		$this->normalize();

tests/phpunit/includes/utils.php

@@ -311,7 +311,10 @@ public function parse( $in ) {
 					xml_get_current_line_number( $this->xml )
 				)
 			);
-			xml_parser_free( $this->xml );
+
+			if ( PHP_VERSION_ID < 80000 ) { // xml_parser_free() has no effect as of PHP 8.0.
+				xml_parser_free( $this->xml );
+			}
 		}
 		return true;
 	}