Ticket #55443: reintroduce-webp-default-output.diff

src/wp-admin/includes/admin-filters.php

@@ -37 +37 @@
 
 add_filter( 'media_upload_tabs', 'update_gallery_tab' );
 
+add_filter( 'image_editor_output_format', 'wp_default_image_output_mapping' );
+
 // Admin color schemes.
 add_action( 'admin_init', 'register_admin_color_schemes', 1 );
 add_action( 'admin_head', 'wp_color_scheme_settings' );

src/wp-admin/includes/media.php

@@ -3843 +3843 @@
                 exit;
         }
 }
+
+/**
+ * Returns the default image output mapping.
+ *
+ * @since 6.1.0
+ */
+function wp_default_image_output_mapping() {
+        return array( 'image/jpeg' => 'image/webp' );
+}

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

@@ -446 +446 @@
                 $name    = wp_basename( $this->file, ".$ext" );
                 $new_ext = strtolower( $extension ? $extension : $ext );
 
+                // When the file extension being generated doesn't match the original image file extension,
+                // add the original extension to the suffix to ensure a unique file name. Prevents
+                // generated file name conflicts when a source image type can have multiple extensions,
+                // eg. .jpg, .jpeg and .jpe are all valid JPEG extensions.
+                if ( ! empty( $extension ) && $extension !== $ext ) {
+                        $suffix .= "-{$ext}";
+                }
+
                 if ( ! is_null( $dest_path ) ) {
                         if ( ! wp_is_stream( $dest_path ) ) {
                                 $_dest_path = realpath( $dest_path );

tests/phpunit/tests/ajax/MediaEdit.php

@@ -67 +67 @@
          */
         public function testImageEditOverwriteConstant() {
                 define( 'IMAGE_EDIT_OVERWRITE', true );
+                $files_that_shouldnt_exist = array();
 
                 require_once ABSPATH . 'wp-admin/includes/image-edit.php';
 

tests/phpunit/tests/image/editor.php

@@ -18 +18 @@
                 require_once ABSPATH . WPINC . '/class-wp-image-editor.php';
 
                 require_once DIR_TESTDATA . '/../includes/mock-image-editor.php';
+                add_filter( 'image_editor_output_format', '__return_empty_array' );
 
                 // This needs to come after the mock image editor class is loaded.
                 parent::set_up();
@@ -226 +227 @@
                 $this->assertSame( trailingslashit( realpath( get_temp_dir() ) ), trailingslashit( realpath( dirname( $editor->generate_filename( null, get_temp_dir() ) ) ) ) );
 
                 // Test with a suffix only.
-                $this->assertSame( 'canola-100x50.png', wp_basename( $editor->generate_filename( null, null, 'png' ) ) );
+                $this->assertSame( 'canola-100x50-jpg.png', wp_basename( $editor->generate_filename( null, null, 'png' ) ) );
 
                 // Combo!
-                $this->assertSame( trailingslashit( realpath( get_temp_dir() ) ) . 'canola-new.png', $editor->generate_filename( 'new', realpath( get_temp_dir() ), 'png' ) );
+                $this->assertSame( trailingslashit( realpath( get_temp_dir() ) ) . 'canola-new-jpg.png', $editor->generate_filename( 'new', realpath( get_temp_dir() ), 'png' ) );
 
                 // Test with a stream destination.
                 $this->assertSame( 'file://testing/path/canola-100x50.jpg', $editor->generate_filename( null, 'file://testing/path' ) );

tests/phpunit/tests/image/editorGd.php

@@ -17 +17 @@
                 require_once ABSPATH . WPINC . '/class-wp-image-editor.php';
                 require_once ABSPATH . WPINC . '/class-wp-image-editor-gd.php';
 
+                remove_filter( 'image_editor_output_format', 'wp_default_image_output_mapping' );
+
                 // This needs to come after the mock image editor class is loaded.
                 parent::set_up();
         }

tests/phpunit/tests/image/editorImagick.php

@@ -18 +18 @@
                 require_once ABSPATH . WPINC . '/class-wp-image-editor-imagick.php';
                 require_once DIR_TESTROOT . '/includes/class-wp-test-stream.php';
 
+                remove_filter( 'image_editor_output_format', 'wp_default_image_output_mapping' );
+
                 // This needs to come after the mock image editor class is loaded.
                 parent::set_up();
         }

tests/phpunit/tests/image/functions.php

@@ -25 +25 @@
                 foreach ( glob( $folder ) as $file ) {
                         unlink( $file );
                 }
+
+                remove_filter( 'image_editor_output_format', 'wp_default_image_output_mapping' );
         }
 
         /**

tests/phpunit/tests/image/intermediateSize.php

@@ -15 +15 @@
                 parent::tear_down();
         }
 
+        /**
+         * Set up the test fixture.
+         */
+        public function set_up() {
+                remove_filter( 'image_editor_output_format', 'wp_default_image_output_mapping' );
+
+                parent::set_up();
+        }
+
         public function _make_attachment( $file, $parent_post_id = 0 ) {
                 $contents = file_get_contents( $file );
                 $upload   = wp_upload_bits( wp_basename( $file ), null, $contents );

tests/phpunit/tests/image/resize.php

@@ -14 +14 @@
                 parent::set_up();
 
                 add_filter( 'wp_image_editors', array( $this, 'wp_image_editors' ) );
+                remove_filter( 'image_editor_output_format', 'wp_default_image_output_mapping' );
         }
 
         public function wp_image_editors() {

tests/phpunit/tests/media.php

@@ -33 +33 @@
                 self::$_sizes                          = wp_get_additional_image_sizes();
                 $GLOBALS['_wp_additional_image_sizes'] = array();
 
-                $filename       = DIR_TESTDATA . '/images/' . self::$large_filename;
+                $filename = DIR_TESTDATA . '/images/' . self::$large_filename;
+                remove_filter( 'image_editor_output_format', 'wp_default_image_output_mapping' );
                 self::$large_id = $factory->attachment->create_upload_object( $filename );
 
                 $post_statuses = array( 'publish', 'future', 'draft', 'auto-draft', 'trash' );
@@ -3617 +3618 @@
                 // Clean up the above filter.
                 remove_filter( 'wp_omit_loading_attr_threshold', '__return_null', 100 );
         }
+
+        /**
+         * Test the wp_default_image_output_mapping function.
+         *
+         * @ticket 55443
+         */
+        public function test_wp_default_image_output_mapping() {
+                $mapping = wp_default_image_output_mapping();
+                $this->assertSame( array( 'image/jpeg' => 'image/webp' ), $mapping );
+        }
 }
 
 /**

tests/phpunit/tests/post/attachments.php

@@ -6 +6 @@
  * @group upload
  */
 class Tests_Post_Attachments extends WP_UnitTestCase {
+        /**
+         * Set up the test fixture.
+         */
+        public function set_up() {
+                remove_filter( 'image_editor_output_format', 'wp_default_image_output_mapping' );
+
+                parent::set_up();
+        }
 
         public function tear_down() {
                 // Remove all uploads.

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

@@ -93 +93 @@
 
                 add_filter( 'rest_pre_dispatch', array( $this, 'wpSetUpBeforeRequest' ), 10, 3 );
                 add_filter( 'posts_clauses', array( $this, 'save_posts_clauses' ), 10, 2 );
+                remove_filter( 'image_editor_output_format', 'wp_default_image_output_mapping' );
         }
 
         public function wpSetUpBeforeRequest( $result ) {