Changeset 60703

Timestamp:

09/03/2025 12:16:17 PM (6 months ago)

Author:

SergeyBiryukov

Message:

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: ​PHP RFC: Deprecations for PHP 8.5: Deprecate no-op functions from the resource to object conversion.

Props TobiasBg, SergeyBiryukov.
See #63061.

Location:

trunk

Files:

• src/wp-admin/includes/image-edit.php (modified) (3 diffs)
• src/wp-admin/link-parse-opml.php (modified) (1 diff)
• src/wp-includes/IXR/class-IXR-message.php (modified) (2 diffs)
• src/wp-includes/atomlib.php (modified) (1 diff)
• src/wp-includes/class-wp-http-curl.php (modified) (3 diffs)
• src/wp-includes/class-wp-image-editor-gd.php (modified) (6 diffs)
• src/wp-includes/feed.php (modified) (1 diff)
• src/wp-includes/functions.php (modified) (2 diffs)
• src/wp-includes/rss.php (modified) (1 diff)
• tests/phpunit/includes/utils.php (modified) (1 diff)
• tests/phpunit/tests/image/functions.php (modified) (1 diff)

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

@@ -546 +546 @@
 
         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;
         }
@@ -581 +584 @@
 
         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;
         }
@@ -607 +613 @@
     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;
         }

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

@@ -97 +97 @@
 }
 
-// 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 );

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

@@ -120 +120 @@
 
             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;
@@ -130 +133 @@
         } 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);
 

trunk/src/wp-includes/atomlib.php

@@ -185 +185 @@
         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);
 

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

@@ -241 +241 @@
 
             $curl_error = curl_error( $handle );
+
             if ( $curl_error ) {
+                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 ) ) {
+                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.' ) );
+            }
+
+            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 );
-                return new WP_Error( 'http_request_failed', __( 'Too many redirects.' ) );
-            }
-
-            curl_close( $handle );
+            }
+
             return array(
                 'headers'  => array(),
@@ -279 +290 @@
                 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 ) );
                     }
@@ -289 +307 @@
             } else {
                 $curl_error = curl_error( $handle );
+
                 if ( $curl_error ) {
+                    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 ) ) {
+                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 );
+                }
+
                 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'] ) {

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

@@ -24 +24 @@
     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 );
+            }
         }
     }
@@ -189 +191 @@
 
         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;
 
@@ -325 +331 @@
         } else {
             $saved = $this->_save( $resized );
-            imagedestroy( $resized );
+
+            if ( PHP_VERSION_ID < 80000 ) { // imagedestroy() has no effect as of PHP 8.0.
+                imagedestroy( $resized );
+            }
         }
 
@@ -383 +392 @@
 
         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;
         }
@@ -409 +422 @@
                 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;
             }
@@ -440 +458 @@
 
             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;
             }

trunk/src/wp-includes/feed.php

@@ -600 +600 @@
     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 );
 

trunk/src/wp-includes/functions.php

@@ -3173 +3173 @@
         $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(
@@ -3402 +3405 @@
                     $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 ) ) {

trunk/src/wp-includes/rss.php

@@ -94 +94 @@
         }
 
-        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 );
 

trunk/tests/phpunit/includes/utils.php

@@ -312 +312 @@
                 )
             );
-            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;

trunk/tests/phpunit/tests/image/functions.php

@@ -361 +361 @@
         $ret  = wp_save_image_file( $file, $img, 'image/jpeg', 1 );
 
-        imagedestroy( $img );
+        if ( PHP_VERSION_ID < 80000 ) { // imagedestroy() has no effect as of PHP 8.0.
+            imagedestroy( $img );
+        }
+
         unlink( $file );