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

Timestamp:

08/16/2020 01:31:57 PM (6 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-includes/class-wp-image-editor-gd.php (modified) (12 diffs)

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

@@ -18 +18 @@
          * GD Resource.
          *
-         * @var resource
+         * @var resource|GdImage
          */
         protected $image;
@@ -96 +96 @@
                 $this->image = @imagecreatefromstring( file_get_contents( $this->file ) );
 
-                if ( ! is_resource( $this->image ) ) {
+                if ( ! is_gd_image( $this->image ) ) {
                         return new WP_Error( 'invalid_image', __( 'File is not an image.' ), $this->file );
                 }
@@ -139 +139 @@
         /**
          * Resizes current image.
-         * Wraps _resize, since _resize returns a GD Resource.
-         *
-         * At minimum, either a height or width must be provided.
-         * If one of the two is set to null, the resize will
-         * maintain aspect ratio according to the provided dimension.
+         *
+         * Wraps `::_resize()` which returns a GD resource or GdImage instance.
+         *
+         * At minimum, either a height or width must be provided. If one of the two is set
+         * to null, the resize will maintain aspect ratio according to the provided dimension.
          *
          * @since 3.5.0
@@ -159 +159 @@
                 $resized = $this->_resize( $max_w, $max_h, $crop );
 
-                if ( is_resource( $resized ) ) {
+                if ( is_gd_image( $resized ) ) {
                         imagedestroy( $this->image );
                         $this->image = $resized;
@@ -175 +175 @@
          * @param int        $max_h
          * @param bool|array $crop
-         * @return resource|WP_Error
+         * @return resource|GdImage|WP_Error
          */
         protected function _resize( $max_w, $max_h, $crop = false ) {
@@ -189 +189 @@
                 imagecopyresampled( $resized, $this->image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h );
 
-                if ( is_resource( $resized ) ) {
+                if ( is_gd_image( $resized ) ) {
                         $this->update_size( $dst_w, $dst_h );
                         return $resized;
@@ -330 +330 @@
                 imagecopyresampled( $dst, $this->image, 0, 0, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h );
 
-                if ( is_resource( $dst ) ) {
+                if ( is_gd_image( $dst ) ) {
                         imagedestroy( $this->image );
                         $this->image = $dst;
@@ -354 +354 @@
                         $rotated      = imagerotate( $this->image, $angle, $transparency );
 
-                        if ( is_resource( $rotated ) ) {
+                        if ( is_gd_image( $rotated ) ) {
                                 imagealphablending( $rotated, true );
                                 imagesavealpha( $rotated, true );
@@ -363 +363 @@
                         }
                 }
+
                 return new WP_Error( 'image_rotate_error', __( 'Image rotate failed.' ), $this->file );
         }
@@ -380 +381 @@
                 $dst = wp_imagecreatetruecolor( $w, $h );
 
-                if ( is_resource( $dst ) ) {
+                if ( is_gd_image( $dst ) ) {
                         $sx = $vert ? ( $w - 1 ) : 0;
                         $sy = $horz ? ( $h - 1 ) : 0;
@@ -392 +393 @@
                         }
                 }
+
                 return new WP_Error( 'image_flip_error', __( 'Image flip failed.' ), $this->file );
         }
@@ -416 +418 @@
 
         /**
-         * @param resource    $image
-         * @param string|null $filename
-         * @param string|null $mime_type
+         * @param resource|GdImage $image
+         * @param string|null      $filename
+         * @param string|null      $mime_type
          * @return array|WP_Error
          */