Skip to content

Fix failing tests on PHP images and ImageMagick versions for 6.8 #9892

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

Closed
desrosj wants to merge 5 commits into from
Closed

Fix failing tests on PHP images and ImageMagick versions for 6.8 #9892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
853253e
Backport 60735 to 6.8
desrosj Sep 15, 2025
c9b6076
Introduce a PHP change to trigger PHPUnit tests
desrosj Sep 15, 2025
ecc9098
Backport r60376
desrosj Sep 15, 2025
e338520
Bad copy/paste.
desrosj Sep 15, 2025
d29a981
Fix bad copy paste.
desrosj Sep 15, 2025
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
12 changes: 12 additions & 0 deletions tests/phpunit/tests/image/editorImagick.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,6 +701,10 @@ static function ( $value ) {
* Test filter `image_max_bit_depth` correctly sets the maximum bit depth of resized images.
*
* @ticket 62285
*
* Temporarily disabled until we can figure out why it fails on the Trixie based PHP container.
* See https://core.trac.wordpress.org/ticket/63932.
* @requires PHP < 8.3
*/
public function test_image_max_bit_depth() {
$file = DIR_TESTDATA . '/images/colors_hdr_p3.avif';
Expand Down Expand Up @@ -773,6 +777,14 @@ public function __return_eight() {
*/
public function test_resizes_are_small_for_16bit_images( $file ) {

// Temporarily disabled. See https://core.trac.wordpress.org/ticket/63932.
if ( DIR_TESTDATA . '/images/png-tests/test8.png' === $file ) {
$version = Imagick::getVersion();
if ( $version['versionNumber'] >= 0x700 ) {
$this->markTestSkipped( 'ImageMagick 7 is unable to optimize grayscale images with 1-bit transparency.' );
}
}

$temp_file = DIR_TESTDATA . '/images/test-temp.png';

$imagick_image_editor = new WP_Image_Editor_Imagick( $file );
Expand Down
24 changes: 24 additions & 0 deletions tests/phpunit/tests/image/resize.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ public function wp_image_editors() {
public function test_resize_jpg() {
$image = $this->resize_helper( DIR_TESTDATA . '/images/test-image.jpg', 25, 25 );

$this->assertNotWPError( $image );

list( $w, $h, $type ) = getimagesize( $image );

unlink( $image );
Expand Down Expand Up @@ -78,6 +80,8 @@ public function test_resize_webp() {

$image = $this->resize_helper( $file, 25, 25 );

$this->assertNotWPError( $image );

list( $w, $h, $type ) = wp_getimagesize( $image );

unlink( $image );
Expand All @@ -92,6 +96,10 @@ public function test_resize_webp() {
* Test resizing AVIF image.
*
* @ticket 51228
*
* Temporarily disabled until we can figure out why it fails on the Trixie based PHP container.
* See https://core.trac.wordpress.org/ticket/63932.
* @requires PHP < 8.3
*/
public function test_resize_avif() {
$file = DIR_TESTDATA . '/images/avif-lossy.avif';
Expand All @@ -104,6 +112,8 @@ public function test_resize_avif() {

$image = $this->resize_helper( $file, 25, 25 );

$this->assertNotWPError( $image );

list( $w, $h, $type ) = wp_getimagesize( $image );

unlink( $image );
Expand All @@ -130,6 +140,8 @@ public function test_resize_heic() {

$image = $this->resize_helper( $file, 25, 25 );

$this->assertNotWPError( $image );

list( $w, $h, $type ) = wp_getimagesize( $image );

unlink( $image );
Expand All @@ -151,6 +163,8 @@ public function test_resize_larger() {
public function test_resize_thumb_128x96() {
$image = $this->resize_helper( DIR_TESTDATA . '/images/2007-06-17DSC_4173.JPG', 128, 96 );

$this->assertNotWPError( $image );

list( $w, $h, $type ) = getimagesize( $image );

unlink( $image );
Expand All @@ -164,6 +178,8 @@ public function test_resize_thumb_128x96() {
public function test_resize_thumb_128x0() {
$image = $this->resize_helper( DIR_TESTDATA . '/images/2007-06-17DSC_4173.JPG', 128, 0 );

$this->assertNotWPError( $image );

list( $w, $h, $type ) = getimagesize( $image );

unlink( $image );
Expand All @@ -177,6 +193,8 @@ public function test_resize_thumb_128x0() {
public function test_resize_thumb_0x96() {
$image = $this->resize_helper( DIR_TESTDATA . '/images/2007-06-17DSC_4173.JPG', 0, 96 );

$this->assertNotWPError( $image );

list( $w, $h, $type ) = getimagesize( $image );

unlink( $image );
Expand All @@ -190,6 +208,8 @@ public function test_resize_thumb_0x96() {
public function test_resize_thumb_150x150_crop() {
$image = $this->resize_helper( DIR_TESTDATA . '/images/2007-06-17DSC_4173.JPG', 150, 150, true );

$this->assertNotWPError( $image );

list( $w, $h, $type ) = getimagesize( $image );

unlink( $image );
Expand All @@ -216,6 +236,8 @@ public function test_resize_thumb_150x100_crop() {
public function test_resize_thumb_50x150_crop() {
$image = $this->resize_helper( DIR_TESTDATA . '/images/2007-06-17DSC_4173.JPG', 50, 150, true );

$this->assertNotWPError( $image );

list( $w, $h, $type ) = getimagesize( $image );

unlink( $image );
Expand All @@ -240,6 +262,8 @@ public function test_resize_non_existent_image() {

/**
* Function to help out the tests
*
* @return string|WP_Error The path to the resized image file or a WP_Error on failure.
*/
protected function resize_helper( $file, $width, $height, $crop = false ) {
$editor = wp_get_image_editor( $file );
Expand Down
5 changes: 5 additions & 0 deletions tests/phpunit/tests/media.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5435,6 +5435,9 @@ public function test_quality_with_image_conversion_file_sizes() {

// Sub-sizes: for each size, the JPEGs should be smaller than the WebP.
$sizes_to_compare = array_intersect_key( $jpeg_sizes['sizes'], $webp_sizes['sizes'] );

$this->assertNotWPError( $sizes_to_compare );

foreach ( $sizes_to_compare as $size => $size_data ) {
$this->assertLessThan( $webp_sizes['sizes'][ $size ]['filesize'], $jpeg_sizes['sizes'][ $size ]['filesize'] );
}
Expand Down Expand Up @@ -5478,6 +5481,8 @@ public function test_quality_with_avif_conversion_file_sizes() {
// Sub-sizes: for each size, the AVIF should be smaller than the JPEG.
$sizes_to_compare = array_intersect_key( $avif_sizes['sizes'], $smaller_avif_sizes['sizes'] );

$this->assertNotWPError( $sizes_to_compare );

foreach ( $sizes_to_compare as $size => $size_data ) {
$this->assertLessThan( $avif_sizes['sizes'][ $size ]['filesize'], $smaller_avif_sizes['sizes'][ $size ]['filesize'] );
}
Expand Down
2 changes: 1 addition & 1 deletion tools/local-env/scripts/install.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ wait_on( {
process.exit( 1 );
} )
.then( () => {
wp_cli( 'db reset --yes' );
wp_cli( 'db reset --yes --defaults' );
const installCommand = process.env.LOCAL_MULTISITE === 'true' ? 'multisite-install' : 'install';
wp_cli( `core ${ installCommand } --title="WordPress Develop" --admin_user=admin --admin_password=password --admin_email=test@test.com --skip-email --url=http://localhost:${process.env.LOCAL_PORT}` );
} )
Expand Down
1 change: 1 addition & 0 deletions wp-config-sample.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
/** The database collate type. Don't change this if in doubt. */
define( 'DB_COLLATE', '' );


/**#@+
* Authentication unique keys and salts.
*
Expand Down
Loading