Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update auto sizes logic in Enhanced Responsive Images plugin to no longer load if already in Core #1547

Merged
merged 6 commits into from
Sep 23, 2024
Merged

Update auto sizes logic in Enhanced Responsive Images plugin to no longer load if already in Core #1547

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c2f9f48
Check WP core function
mukeshpanchal27 Sep 19, 2024
2e8dabb
Update unit tests
mukeshpanchal27 Sep 19, 2024
a7410d2
Address unit tests feedbacks
mukeshpanchal27 Sep 23, 2024
fb5d2ff
Apply suggestions from code review
mukeshpanchal27 Sep 23, 2024
de6022c
Re-add test_hooks test
mukeshpanchal27 Sep 23, 2024
791c5a2
Revert test changes
mukeshpanchal27 Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions plugins/auto-sizes/hooks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ function auto_sizes_update_image_attributes( $attr ): array {

return $attr;
}
add_filter( 'wp_get_attachment_image_attributes', 'auto_sizes_update_image_attributes' );

/**
* Adds auto to the sizes attribute to the image, if applicable.
Expand Down Expand Up @@ -85,7 +84,12 @@ function auto_sizes_update_content_img_tag( $html ): string {
$processor->set_attribute( 'sizes', "auto, $sizes" );
return $processor->get_updated_html();
}
add_filter( 'wp_content_img_tag', 'auto_sizes_update_content_img_tag' );

// Skip loading plugin filters if WordPress Core already loaded the functionality.
if ( ! function_exists( 'wp_sizes_attribute_includes_valid_auto' ) ) {
add_filter( 'wp_get_attachment_image_attributes', 'auto_sizes_update_image_attributes' );
add_filter( 'wp_content_img_tag', 'auto_sizes_update_content_img_tag' );
}

/**
* Checks whether the given 'sizes' attribute includes the 'auto' keyword as the first item in the list.
Expand Down
14 changes: 6 additions & 8 deletions plugins/auto-sizes/tests/test-auto-sizes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ public function get_image_tag( int $attachment_id ): string {
}

public function test_hooks(): void {
$this->assertSame( 10, has_filter( 'wp_get_attachment_image_attributes', 'auto_sizes_update_image_attributes' ) );
$this->assertSame( 10, has_filter( 'wp_content_img_tag', 'auto_sizes_update_content_img_tag' ) );
$this->assertSame( function_exists( 'wp_sizes_attribute_includes_valid_auto' ) ? false : 10, has_filter( 'wp_get_attachment_image_attributes', 'auto_sizes_update_image_attributes' ) );
$this->assertSame( function_exists( 'wp_sizes_attribute_includes_valid_auto' ) ? false : 10, has_filter( 'wp_content_img_tag', 'auto_sizes_update_content_img_tag' ) );
$this->assertSame( 10, has_action( 'wp_head', 'auto_sizes_render_generator' ) );
}

Expand Down Expand Up @@ -206,13 +206,11 @@ public function data_image_with_existing_auto_sizes(): array {
}

/**
* Test printing the meta generator tag.
*
* @covers ::auto_sizes_render_generator
* Test auto-sizes meta tag present in wp_head hook.
*/
public function test_auto_sizes_render_generator(): void {
$tag = get_echo( 'auto_sizes_render_generator' );
$this->assertStringStartsWith( '<meta', $tag );
public function test_auto_sizes_meta_tag_present_in_wp_head_hook(): void {
$tag = get_echo( 'wp_head' );
$this->assertStringContainsString( '<meta', $tag );
mukeshpanchal27 marked this conversation as resolved.
Show resolved Hide resolved
$this->assertStringContainsString( 'generator', $tag );
$this->assertStringContainsString( 'auto-sizes ' . IMAGE_AUTO_SIZES_VERSION, $tag );
}
Expand Down