Ticket #54356: 54356.2.diff

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

@@ -240 +240 @@
                 // Use the output mime type if present. If not, fall back to the input/initial mime type.
                 $mime_type = ! empty( $this->output_mime_type ) ? $this->output_mime_type : $this->mime_type;
                 // Get the default quality setting for the mime type.
-                $default_quality = $this->get_default_quality( $mime_type );
+                $default_quality = $this->get_default_quality();
 
                 if ( null === $quality ) {
                         /**
@@ -297 +297 @@
         }
 
         /**
-         * Returns the default compression quality setting for the mime type.
+         * Returns the default compression quality setting.
          *
          * @since 5.8.1
+         * @since 6.1.0 Deprecated the `$mime_type` parameter. All mime types use the same default quality.
          *
-         * @param string $mime_type
-         * @return int The default quality setting for the mime type.
+         * @param string $mime_type Deprecated.
+         * @return int The default quality setting.
          */
         protected function get_default_quality( $mime_type ) {
-                switch ( $mime_type ) {
-                        case 'image/webp':
-                                $quality = 86;
-                                break;
-                        case 'image/jpeg':
-                        default:
-                                $quality = $this->default_quality;
-                }
-
-                return $quality;
+                return $this->default_quality;
         }
 
         /**

tests/phpunit/tests/image/editor.php

@@ -126 +126 @@
                 $this->assertSame( 82, $editor->get_quality(), 'Default quality setting is 82.' );
 
                 // Quality should change to the output format's value.
-                // A PNG image will be converted to WEBP whose quialty should be 86.
+                // A PNG image will be converted to WEBP whose quality should be 82.
                 $editor->save();
-                $this->assertSame( 86, $editor->get_quality(), 'Output image format is WEBP. Quality setting for it should be 86.' );
+                $this->assertSame( 82, $editor->get_quality(), 'Output image format is WEBP. Quality setting for it should be 82.' );
 
                 // Removing PNG to WEBP conversion on save. Quality setting should reset to the default.
                 $editor->reset_output_mime_type();
@@ -150 +150 @@
                 $this->assertSame( 56, $editor->get_quality(), 'Filtered default quality for JPEG is 56.' );
 
                 // Quality should change to the output format's value as filtered above.
-                // A JPEG image will be converted to WEBP whose quialty should be 42.
+                // A JPEG image will be converted to WEBP whose quality should be 42.
                 $editor->save();
-                $this->assertSame( 42, $editor->get_quality(), 'Image conversion from JPEG to WEBP. Filtered WEBP quality shoild be 42.' );
+                $this->assertSame( 42, $editor->get_quality(), 'Image conversion from JPEG to WEBP. Filtered WEBP quality should be 42.' );
 
                 // After removing the conversion the quality setting should reset to the filtered value for the original image type, JPEG.
                 $editor->reset_output_mime_type();