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

Timestamp:

09/19/2022 10:51:53 PM (3 years ago)

Author:

davidbaumwald

Message:

Media: Revert WebP generation.

Given ​Matt's recent post about removing WebP from core and possibly implementing the feature in a future ​Canonical Plugin, this change reverts changesets [54086], [54094], and [54097]. Additionally, [54210] contained a coding standards follow-up in one of the affected files that is no longer needed.

Reverts [54086], [54094], and [54097].

Props SergeyBiryukov.
See #55443.

File:

• trunk/src/wp-includes/class-wp-image-editor.php (modified) (9 diffs)

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

@@ -16 +16 @@
     protected $file              = null;
     protected $size              = null;
-    protected $size_name         = '';
     protected $mime_type         = null;
     protected $output_mime_type  = null;
@@ -120 +119 @@
      *
      * @param array $sizes {
-     *     Associative array of image size names and their data. Default sizes are 'small', 'medium', 'large'.
+     *     An array of image size arrays. Default sizes are 'small', 'medium', 'large'.
      *
      *     @type array ...$0 {
@@ -188 +187 @@
      * @since 3.5.0
      *
-     * @return array {
+     * @return int[] {
      *     Dimensions of the image.
      *
@@ -204 +203 @@
      * @since 3.5.0
      *
-     * @param int $width  The image width.
-     * @param int $height The image height.
-     * @return true True on success, false on failure.
+     * @param int $width
+     * @param int $height
+     * @return true
      */
     protected function update_size( $width = null, $height = null ) {
@@ -214 +213 @@
         );
         return true;
-    }
-
-    /**
-     * Gets the current image size name.
-     *
-     * @since 6.1.0
-     *
-     * @return string Image size name, or empty string if none set.
-     */
-    public function get_size_name() {
-        return $this->size_name;
-    }
-
-    /**
-     * Sets the current image size name.
-     *
-     * @since 6.1.0
-     *
-     * @param string $size_name The image size name.
-     */
-    protected function update_size_name( $size_name ) {
-        $this->size_name = (string) $size_name;
     }
 
@@ -389 +366 @@
          *
          * @since 5.8.0
-         * @since 6.1.0 The $size_name parameter was added.
          *
          * @param string[] $output_format {
@@ -399 +375 @@
          * @param string $filename  Path to the image.
          * @param string $mime_type The source image mime type.
-         * @param string $size_name The image size name to create, or empty string if not set.
          */
-        $output_format = apply_filters( 'image_editor_output_format', array(), $filename, $mime_type, $this->size_name );
+        $output_format = apply_filters( 'image_editor_output_format', array(), $filename, $mime_type );
 
         if ( isset( $output_format[ $mime_type ] )
@@ -451 +426 @@
     }
 
-        /**
-     * Builds an output filename based on current file, and adding proper suffix.
-     *
-     * @since 3.5.0
-     * @since 6.1.0 Skips adding a suffix when set to an empty string. When the
-     *              file extension being generated doesn't match the image file extension,
-     *              add the extension to the suffix
-     *
-     * @param string $suffix    Optional. Suffix to add to the filename. The default null
-     *                          will result in a 'widthxheight' suffix. Passing
-     *                          an empty string will result in no suffix.
-     * @param string $dest_path Optional. The path to save the file to. The default null
-     *                          will use the image file path.
-     * @param string $extension Optional. The file extension to use. The default null
-     *                          will use the image file extension.
-     * @return string filename The generated file name.
+    /**
+     * Builds an output filename based on current file, and adding proper suffix
+     *
+     * @since 3.5.0
+     *
+     * @param string $suffix
+     * @param string $dest_path
+     * @param string $extension
+     * @return string filename
      */
     public function generate_filename( $suffix = null, $dest_path = null, $extension = null ) {
         // $suffix will be appended to the destination filename, just before the extension.
-        if ( null === $suffix ) {
+        if ( ! $suffix ) {
             $suffix = $this->get_suffix();
         }
@@ -491 +459 @@
         }
 
-        if ( empty( $suffix ) ) {
-            $suffix = '';
-        } else {
-            $suffix = "-{$suffix}";
-        }
-
-        // When the file extension being generated doesn't match the image file extension,
-        // add the extension to the suffix to ensure a unique file name. Prevents
-        // name conflicts when a single image type can have multiple extensions,
-        // eg. .jpg, .jpeg and .jpe are all valid JPEG extensions.
-        if ( ! empty( $extension ) && $extension !== $ext ) {
-            $suffix .= "-{$ext}";
-        }
-
-        return trailingslashit( $dir ) . "{$name}{$suffix}.{$new_ext}";
+        return trailingslashit( $dir ) . "{$name}-{$suffix}.{$new_ext}";
     }