Changeset 58457

Timestamp:

06/21/2024 08:35:25 PM (4 months ago)

Author:

joedolson

Message:

Media: Fix implicit conversion from float to int in image cropping.

Cast crop values to integers to prevent PHP error caused by implicit conversion from float to int values when cropping images using ImageMagick.

Props skithund, mai21, nicomollet, amanias1977, joedolson.
Fixes #59782.

Location:

trunk

Files:

• src/wp-admin/includes/image-edit.php (modified) (1 diff)
• src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php (modified) (1 diff)
• tests/phpunit/tests/rest-api/rest-attachments-controller.php (modified) (1 diff)

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

@@ -737 +737 @@
 
                     $scale = isset( $sel->r ) ? $sel->r : 1 / _image_get_preview_ratio( $w, $h ); // Discard preview scaling.
-                    $image->crop( $sel->x * $scale, $sel->y * $scale, $sel->w * $scale, $sel->h * $scale );
+                    $image->crop( (int) ( $sel->x * $scale ), (int) ( $sel->y * $scale ), (int) ( $sel->w * $scale ), (int) ( $sel->h * $scale ) );
                 } else {
                     $scale = isset( $sel->r ) ? $sel->r : 1 / _image_get_preview_ratio( imagesx( $image ), imagesy( $image ) ); // Discard preview scaling.

trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php

@@ -622 +622 @@
                     $size = $image_editor->get_size();
 
-                    $crop_x = round( ( $size['width'] * $args['left'] ) / 100.0 );
-                    $crop_y = round( ( $size['height'] * $args['top'] ) / 100.0 );
-                    $width  = round( ( $size['width'] * $args['width'] ) / 100.0 );
-                    $height = round( ( $size['height'] * $args['height'] ) / 100.0 );
+                    $crop_x = (int) round( ( $size['width'] * $args['left'] ) / 100.0 );
+                    $crop_y = (int) round( ( $size['height'] * $args['top'] ) / 100.0 );
+                    $width  = (int) round( ( $size['width'] * $args['width'] ) / 100.0 );
+                    $height = (int) round( ( $size['height'] * $args['height'] ) / 100.0 );
 
                     if ( $size['width'] !== $width && $size['height'] !== $height ) {

trunk/tests/phpunit/tests/rest-api/rest-attachments-controller.php

@@ -2377 +2377 @@
         $this->assertCount( 1, WP_Image_Editor_Mock::$spy['crop'] );
         $this->assertSame(
-            array( 320.0, 48.0, 64.0, 24.0 ),
+            array( 320, 48, 64, 24 ),
             WP_Image_Editor_Mock::$spy['crop'][0]
         );