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

Timestamp:

08/16/2020 01:31:57 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Code Modernization: Introduce is_gd_image() to check for PHP 8 GdImage object instances.

In PHP 8, the GD extension uses GdImage objects instead of resources for its underlying data structures.

This updates the existing is_resource() calls for image resources in core to accomodate for GdImage instances as well.

Props ayeshrajans, jrf.
Fixes #50833.

File:

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

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

@@ -292 +292 @@
          * @deprecated 3.5.0 Use {@see 'image_editor_save_pre'} instead.
          *
-         * @param resource $image         Image resource to be streamed.
-         * @param int      $attachment_id The attachment post ID.
+         * @param resource|GdImage $image         Image resource to be streamed.
+         * @param int              $attachment_id The attachment post ID.
          */
         $image = apply_filters_deprecated( 'image_save_pre', array( $image, $attachment_id ), '3.5.0', 'image_editor_save_pre' );
@@ -421 +421 @@
  *
  * @ignore
- * @param resource  $img   Image resource.
- * @param float|int $angle Image rotation angle, in degrees.
- * @return resource|false GD image resource, false otherwise.
+ * @param resource|GdImage  $img   Image resource.
+ * @param float|int         $angle Image rotation angle, in degrees.
+ * @return resource|GdImage|false GD image resource or GdImage instance, false otherwise.
  */
 function _rotate_image_resource( $img, $angle ) {
     _deprecated_function( __FUNCTION__, '3.5.0', 'WP_Image_Editor::rotate()' );
+
     if ( function_exists( 'imagerotate' ) ) {
         $rotated = imagerotate( $img, $angle, 0 );
-        if ( is_resource( $rotated ) ) {
+
+        if ( is_gd_image( $rotated ) ) {
             imagedestroy( $img );
             $img = $rotated;
         }
     }
+
     return $img;
 }
@@ -445 +448 @@
  *
  * @ignore
- * @param resource $img  Image resource.
- * @param bool     $horz Whether to flip horizontally.
- * @param bool     $vert Whether to flip vertically.
- * @return resource (maybe) flipped image resource.
+ * @param resource|GdImage $img  Image resource or GdImage instance.
+ * @param bool             $horz Whether to flip horizontally.
+ * @param bool             $vert Whether to flip vertically.
+ * @return resource|GdImage (maybe) flipped image resource or GdImage instance.
  */
 function _flip_image_resource( $img, $horz, $vert ) {
     _deprecated_function( __FUNCTION__, '3.5.0', 'WP_Image_Editor::flip()' );
+
     $w   = imagesx( $img );
     $h   = imagesy( $img );
     $dst = wp_imagecreatetruecolor( $w, $h );
-    if ( is_resource( $dst ) ) {
+
+    if ( is_gd_image( $dst ) ) {
         $sx = $vert ? ( $w - 1 ) : 0;
         $sy = $horz ? ( $h - 1 ) : 0;
@@ -466 +471 @@
         }
     }
+
     return $img;
 }
@@ -475 +481 @@
  *
  * @ignore
- * @param resource $img Image resource.
- * @param float    $x   Source point x-coordinate.
- * @param float    $y   Source point y-coordinate.
- * @param float    $w   Source width.
- * @param float    $h   Source height.
- * @return resource (maybe) cropped image resource.
+ * @param resource|GdImage $img Image resource or GdImage instance.
+ * @param float            $x   Source point x-coordinate.
+ * @param float            $y   Source point y-coordinate.
+ * @param float            $w   Source width.
+ * @param float            $h   Source height.
+ * @return resource|GdImage (maybe) cropped image resource or GdImage instance.
  */
 function _crop_image_resource( $img, $x, $y, $w, $h ) {
     $dst = wp_imagecreatetruecolor( $w, $h );
-    if ( is_resource( $dst ) ) {
+
+    if ( is_gd_image( $dst ) ) {
         if ( imagecopy( $dst, $img, 0, 0, $x, $y, $w, $h ) ) {
             imagedestroy( $img );
@@ -490 +497 @@
         }
     }
+
     return $img;
 }
@@ -503 +511 @@
  */
 function image_edit_apply_changes( $image, $changes ) {
-    if ( is_resource( $image ) ) {
+    if ( is_gd_image( $image ) ) {
         /* translators: 1: $image, 2: WP_Image_Editor */
         _deprecated_argument( __FUNCTION__, '3.5.0', sprintf( __( '%1$s needs to be a %2$s object.' ), '$image', 'WP_Image_Editor' ) );
@@ -567 +575 @@
          */
         $image = apply_filters( 'wp_image_editor_before_change', $image, $changes );
-    } elseif ( is_resource( $image ) ) {
+    } elseif ( is_gd_image( $image ) ) {
 
         /**
@@ -575 +583 @@
          * @deprecated 3.5.0 Use {@see 'wp_image_editor_before_change'} instead.
          *
-         * @param resource $image   GD image resource.
-         * @param array    $changes Array of change operations.
+         * @param resource|GdImage $image   GD image resource or GdImage instance.
+         * @param array            $changes Array of change operations.
          */
         $image = apply_filters_deprecated( 'image_edit_before_change', array( $image, $changes ), '3.5.0', 'wp_image_editor_before_change' );