Skip to content

Commit 875722e

Browse files
committed
Confirm proper GD AVIF support in Docker images
1 parent e7c0b0f commit 875722e

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ services:
3232
# The PHP container.
3333
##
3434
php:
35-
image: wordpressdevelop/php:${LOCAL_PHP-latest}
35+
image: ghcr.io/wordpress/wpdev-docker-images/php:${LOCAL_PHP-latest}-189
3636

3737
networks:
3838
- wpdevnet
@@ -95,7 +95,7 @@ services:
9595
# The WP CLI container.
9696
##
9797
cli:
98-
image: wordpressdevelop/cli:${LOCAL_PHP-latest}
98+
image: ghcr.io/wordpress/wpdev-docker-images/cli:${LOCAL_PHP-latest}-189
9999

100100
networks:
101101
- wpdevnet

tests/phpunit/tests/image/resize.php

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,15 +87,19 @@ public function test_resize_webp() {
8787
* Test resizing AVIF image.
8888
*
8989
* @ticket 51228
90-
*
91-
* Temporarily disabled until we can figure out why it fails on the Trixie based PHP container.
92-
* See https://core.trac.wordpress.org/ticket/63932.
93-
* @requires PHP < 8.3
9490
*/
9591
public function test_resize_avif() {
9692
$file = DIR_TESTDATA . '/images/avif-lossy.avif';
9793
$editor = wp_get_image_editor( $file );
9894

95+
if ( 'WP_Image_Editor_Imagick' == $this->editor_engine ) {
96+
$version = Imagick::getVersion();
97+
98+
if ( $version['versionNumber'] >= 0x700 ) {
99+
$this->markTestSkipped( 'ImageMagick 7 is unable to perform this test at this time.' );
100+
}
101+
}
102+
99103
// Check if the editor supports the avif mime type.
100104
if ( is_wp_error( $editor ) || ! $editor->supports_mime_type( 'image/avif' ) ) {
101105
$this->markTestSkipped( sprintf( 'No AVIF support in the editor engine %s on this system.', $this->editor_engine ) );

tests/phpunit/tests/media.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5472,10 +5472,6 @@ public function test_quality_with_image_conversion_file_sizes() {
54725472
* Test AVIF quality filters.
54735473
*
54745474
* @ticket 61614
5475-
*
5476-
* Temporarily disabled until we can figure out why it fails on the Trixie based PHP container.
5477-
* See https://core.trac.wordpress.org/ticket/63932.
5478-
* @requires PHP < 8.3
54795475
*/
54805476
public function test_quality_with_avif_conversion_file_sizes() {
54815477
$temp_dir = get_temp_dir();

0 commit comments

Comments
 (0)