Changeset 60703 for trunk/src/wp-admin/includes/image-edit.php

Timestamp:

09/03/2025 12:16:17 PM (3 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.

File:

• trunk/src/wp-admin/includes/image-edit.php (modified) (3 diffs)

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;
         }