vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-04-08 22:54:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Media: Revert WebP generation.

Browse Source 
Given [https://make.wordpress.org/core/2022/09/11/webp-in-core-for-6-1/ Matt's recent post about removing WebP from core] and possibly implementing the feature in a future [https://make.wordpress.org/core/2022/09/11/canonical-plugins-revisited/ "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.

git-svn-id: https://develop.svn.wordpress.org/trunk@54226 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
David Baumwald
2022-09-19 22:51:53 +00:00
parent cc3cb33ef5
commit 3b3d7ebb71
17 changed files with 33 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/phpunit/tests/image/editor.php
View File

@@ -18,20 +18,11 @@ class Tests_Image_Editor extends WP_Image_UnitTestCase {
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();
}
/**
* Tear down the class.
*/
public function tear_down() {
remove_filter( 'image_editor_output_format', '__return_empty_array' );
parent::tear_down();
}
/**
* Test wp_get_image_editor() where load returns true
*
@@ -235,10 +226,10 @@ class Tests_Image_Editor extends WP_Image_UnitTestCase {
$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-jpg.png', wp_basename( $editor->generate_filename( null, null, 'png' ) ) );
$this->assertSame( 'canola-100x50.png', wp_basename( $editor->generate_filename( null, null, 'png' ) ) );
// Combo!
$this->assertSame( trailingslashit( realpath( get_temp_dir() ) ) . 'canola-new-jpg.png', $editor->generate_filename( 'new', realpath( get_temp_dir() ), 'png' ) );
$this->assertSame( trailingslashit( realpath( get_temp_dir() ) ) . 'canola-new.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' ) );

4
tests/phpunit/tests/image/editorGd.php
View File

@@ -17,8 +17,6 @@ class Tests_Image_Editor_GD extends WP_Image_UnitTestCase {
require_once ABSPATH . WPINC . '/class-wp-image-editor.php';
require_once ABSPATH . WPINC . '/class-wp-image-editor-gd.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();
}
@@ -32,8 +30,6 @@ class Tests_Image_Editor_GD extends WP_Image_UnitTestCase {
$this->remove_added_uploads();
remove_filter( 'image_editor_output_format', '__return_empty_array' );
parent::tear_down();
}

4
tests/phpunit/tests/image/editorImagick.php
View File

@@ -18,8 +18,6 @@ class Tests_Image_Editor_Imagick extends WP_Image_UnitTestCase {
require_once ABSPATH . WPINC . '/class-wp-image-editor-imagick.php';
require_once DIR_TESTROOT . '/includes/class-wp-test-stream.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();
}
@@ -33,8 +31,6 @@ class Tests_Image_Editor_Imagick extends WP_Image_UnitTestCase {
$this->remove_added_uploads();
remove_filter( 'image_editor_output_format', '__return_empty_array' );
parent::tear_down();
}

10
tests/phpunit/tests/image/functions.php
View File

@@ -25,16 +25,6 @@ class Tests_Image_Functions extends WP_UnitTestCase {
foreach ( glob( $folder ) as $file ) {
unlink( $file );
}
add_filter( 'image_editor_output_format', '__return_empty_array' );
}
/**
* Tear down the class.
*/
public function tear_down() {
remove_filter( 'image_editor_output_format', '__return_empty_array' );
parent::tear_down();
}
/**

12
tests/phpunit/tests/image/intermediateSize.php
View File

@@ -5,15 +5,6 @@
* @group upload
*/
class Tests_Image_Intermediate_Size extends WP_UnitTestCase {
/**
* Set up the test fixture.
*/
public function set_up() {
add_filter( 'image_editor_output_format', '__return_empty_array' );
parent::set_up();
}
public function tear_down() {
$this->remove_added_uploads();
@@ -21,9 +12,6 @@ class Tests_Image_Intermediate_Size extends WP_UnitTestCase {
remove_image_size( 'false-height' );
remove_image_size( 'false-width' );
remove_image_size( 'off-by-one' );
remove_filter( 'image_editor_output_format', '__return_empty_array' );
parent::tear_down();
}

9
tests/phpunit/tests/image/resize.php
View File

@@ -14,15 +14,6 @@ abstract class WP_Tests_Image_Resize_UnitTestCase extends WP_Image_UnitTestCase
parent::set_up();
add_filter( 'wp_image_editors', array( $this, 'wp_image_editors' ) );
add_filter( 'image_editor_output_format', '__return_empty_array' );
}
/**
* Tear down the class.
*/
public function tear_down() {
remove_filter( 'image_editor_output_format', '__return_empty_array' );
parent::tear_down();
}
public function wp_image_editors() {

129
tests/phpunit/tests/media.php
View File

@@ -33,8 +33,7 @@ CAP;
self::$_sizes = wp_get_additional_image_sizes();
$GLOBALS['_wp_additional_image_sizes'] = array();
$filename = DIR_TESTDATA . '/images/' . self::$large_filename;
add_filter( 'image_editor_output_format', '__return_empty_array' );
$filename = DIR_TESTDATA . '/images/' . self::$large_filename;
self::$large_id = $factory->attachment->create_upload_object( $filename );
$post_statuses = array( 'publish', 'future', 'draft', 'auto-draft', 'trash' );
@@ -69,7 +68,6 @@ CAP;
public static function wpTearDownAfterClass() {
$GLOBALS['_wp_additional_image_sizes'] = self::$_sizes;
remove_filter( 'image_editor_output_format', '__return_empty_array' );
}
public static function tear_down_after_class() {
@@ -3623,131 +3621,6 @@ EOF;
// 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( array(), 'test.jpg', 'image/jpeg', '' );
$this->assertSame( array( 'image/jpeg' => 'image/webp' ), $mapping );
}
/**
* Test that wp_default_image_output_mapping doesn't overwrite existing mappings.
*
* @ticket 55443
*/
public function test_wp_default_image_output_mapping_existing() {
$mapping = array( 'mime/png' => 'mime/webp' );
$mapping = wp_default_image_output_mapping( $mapping, 'test.jpg', 'image/jpeg', '' );
$this->assertSame(
array(
'mime/png' => 'mime/webp',
'image/jpeg' => 'image/webp',
),
$mapping
);
}
/**
* Test that the image editor default output for JPEGs is WebP.
*
* @ticket 55443
*/
public function test_wp_image_editor_default_output_maps_to_webp() {
remove_filter( 'image_editor_output_format', '__return_empty_array' );
$editor = wp_get_image_editor( DIR_TESTDATA . '/images/canola.jpg' );
$this->assertNotWPError( $editor );
$resized = $editor->resize( 100, 100, false );
$this->assertNotWPError( $resized );
$saved = $editor->save();
$this->assertNotWPError( $saved );
if ( $editor->supports_mime_type( 'image/webp' ) ) {
$this->assertSame( 'image/webp', $saved['mime-type'] );
$this->assertSame( 'canola-100x75-jpg.webp', $saved['file'] );
} else {
$this->assertSame( 'image/jpeg', $saved['mime-type'] );
$this->assertSame( 'canola-100x75.jpg', $saved['file'] );
}
}
/**
* @ticket 56526
* @dataProvider data_wp_default_image_output_mapping_size_filter
*/
public function test_wp_default_image_output_mapping_size_filter( $size_name, $filter_callback, $expects_webp ) {
remove_all_filters( 'wp_image_sizes_with_additional_mime_type_support' );
if ( $filter_callback ) {
add_filter( 'wp_image_sizes_with_additional_mime_type_support', $filter_callback );
}
$mapping = wp_default_image_output_mapping( array(), 'test.jpg', 'image/jpeg', $size_name );
if ( $expects_webp ) {
$this->assertSame( array( 'image/jpeg' => 'image/webp' ), $mapping );
} else {
$this->assertSame( array(), $mapping );
}
}
public function data_wp_default_image_output_mapping_size_filter() {
return array(
'default size thumbnail' => array(
'thumbnail',
null,
true,
),
'default size medium' => array(
'medium',
null,
true,
),
'default size medium_large' => array(
'medium_large',
null,
true,
),
'default size large' => array(
'large',
null,
true,
),
'default size unset' => array(
'medium',
function( $enabled_sizes ) {
unset( $enabled_sizes['medium'] );
return $enabled_sizes;
},
false,
),
'default size set to false' => array(
'medium',
function( $enabled_sizes ) {
$enabled_sizes['medium'] = false;
return $enabled_sizes;
},
false,
),
'custom size' => array(
'custom',
null,
false,
),
'custom size opted in' => array(
'custom',
function( $enabled_sizes ) {
$enabled_sizes['custom'] = true;
return $enabled_sizes;
},
true,
),
);
}
}
/**

9
tests/phpunit/tests/post/attachments.php
View File

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

3
tests/phpunit/tests/rest-api/rest-attachments-controller.php
View File

@@ -93,7 +93,6 @@ class WP_Test_REST_Attachments_Controller extends WP_Test_REST_Post_Type_Control
add_filter( 'rest_pre_dispatch', array( $this, 'wpSetUpBeforeRequest' ), 10, 3 );
add_filter( 'posts_clauses', array( $this, 'save_posts_clauses' ), 10, 2 );
add_filter( 'image_editor_output_format', '__return_empty_array' );
}
public function wpSetUpBeforeRequest( $result ) {
@@ -122,8 +121,6 @@ class WP_Test_REST_Attachments_Controller extends WP_Test_REST_Post_Type_Control
WP_Image_Editor_Mock::$size_return = null;
}
remove_filter( 'image_editor_output_format', '__return_empty_array' );
parent::tear_down();
}