Changeset 58692

Timestamp:

07/09/2024 01:05:25 PM (3 months ago)

Author:

davidbaumwald

Message:

REST API: Correct image cropping tools in the block editor.

As of [58457], the width and height cropping values are cast to an integer before the comparison to see if the target width and height differ from the original width and height.
Since they are now integers, it exposes a bug where the && of the if conditional meant that if you were only cropping in one dimension, the check wouldn't pass, and cropping would not occur.
In the block editor, the cropping tools are aspect ratio based, so one of the dimensions will always match that of the source image. Therefore, now that the values are cast as integers, the condition that allows a cropping to occur needs to be updated. If either width or height is different from the source image, then a crop should be allowed.

Follow-up to [50124], [58457].

Reviewed by davidbaumwald.
Merges [58612] to the 6.6 branch.

Props andrewserong, jrf, kevin940726.
Fixes #61514. See #59782.

Location:

branches/6.6

Files:

• . (modified) (1 prop)
• 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)

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

@@ -627 +627 @@
                     $height = (int) round( ( $size['height'] * $args['height'] ) / 100.0 );
 
-                    if ( $size['width'] !== $width && $size['height'] !== $height ) {
+                    if ( $size['width'] !== $width || $size['height'] !== $height ) {
                         $result = $image_editor->crop( $crop_x, $crop_y, $width, $height );
 

branches/6.6/tests/phpunit/tests/rest-api/rest-attachments-controller.php

@@ -2383 +2383 @@
 
     /**
+     * @ticket 61514
+     * @requires function imagejpeg
+     */
+    public function test_edit_image_crop_one_axis() {
+        wp_set_current_user( self::$superadmin_id );
+        $attachment = self::factory()->attachment->create_upload_object( self::$test_file );
+
+        $this->setup_mock_editor();
+        WP_Image_Editor_Mock::$size_return = array(
+            'width'  => 640,
+            'height' => 480,
+        );
+
+        WP_Image_Editor_Mock::$edit_return['crop'] = new WP_Error();
+
+        $request = new WP_REST_Request( 'POST', "/wp/v2/media/{$attachment}/edit" );
+        $request->set_body_params(
+            array(
+                'x'      => 50,
+                'y'      => 0,
+                'width'  => 10,
+                'height' => 100,
+                'src'    => wp_get_attachment_image_url( $attachment, 'full' ),
+
+            )
+        );
+        $response = rest_do_request( $request );
+        $this->assertErrorResponse( 'rest_image_crop_failed', $response, 500 );
+
+        $this->assertCount( 1, WP_Image_Editor_Mock::$spy['crop'] );
+        $this->assertSame(
+            array( 320, 0, 64, 480 ),
+            WP_Image_Editor_Mock::$spy['crop'][0]
+        );
+    }
+
+    /**
      * @ticket 44405
      * @requires function imagejpeg