Changeset 60745

Timestamp:

09/15/2025 07:17:52 PM (11 months ago)

Author:

desrosj

Message:

Build/Test Tools: Fix tooling and PHPUnit test issues.

This fixes the PHPUnit test suite for the 6.7 branch by:

• Fixing issues with the env:install script when using newer PHP images.
• Temporarily disables failing tests with ImageMagick 7 is in use.

Backports [60735] and [60736] to the 6.7 branch.

See #63876, #63932.

Location:

branches/6.7

Files:

• . (modified) (1 prop)
• tests/phpunit/tests/image/editorImagick.php (modified) (1 diff)
• tests/phpunit/tests/image/resize.php (modified) (11 diffs)
• tests/phpunit/tests/media.php (modified) (2 diffs)
• tools/local-env/scripts/install.js (modified) (1 diff)

branches/6.7/tests/phpunit/tests/image/editorImagick.php

@@ -657 +657 @@
                 }
 
+                $version = Imagick::getVersion();
+                if ( $version['versionNumber'] < 0x675 ) {
+                        $this->markTestSkipped( 'The version of ImageMagick does not support removing alpha channels from PDFs.' );
+                }
+
                 $test_file     = DIR_TESTDATA . '/images/test-alpha.pdf';
                 $attachment_id = $this->factory->attachment->create_upload_object( $test_file );

branches/6.7/tests/phpunit/tests/image/resize.php

@@ -24 +24 @@
                 $image = $this->resize_helper( DIR_TESTDATA . '/images/test-image.jpg', 25, 25 );
 
+                $this->assertNotWPError( $image );
+
                 list( $w, $h, $type ) = getimagesize( $image );
 
@@ -79 +81 @@
                 $image = $this->resize_helper( $file, 25, 25 );
 
+                $this->assertNotWPError( $image );
+
                 list( $w, $h, $type ) = wp_getimagesize( $image );
 
@@ -93 +97 @@
          *
          * @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() {
@@ -105 +113 @@
                 $image = $this->resize_helper( $file, 25, 25 );
 
+                $this->assertNotWPError( $image );
+
                 list( $w, $h, $type ) = wp_getimagesize( $image );
 
@@ -131 +141 @@
                 $image = $this->resize_helper( $file, 25, 25 );
 
+                $this->assertNotWPError( $image );
+
                 list( $w, $h, $type ) = wp_getimagesize( $image );
 
@@ -152 +164 @@
                 $image = $this->resize_helper( DIR_TESTDATA . '/images/2007-06-17DSC_4173.JPG', 128, 96 );
 
+                $this->assertNotWPError( $image );
+
                 list( $w, $h, $type ) = getimagesize( $image );
 
@@ -165 +179 @@
                 $image = $this->resize_helper( DIR_TESTDATA . '/images/2007-06-17DSC_4173.JPG', 128, 0 );
 
+                $this->assertNotWPError( $image );
+
                 list( $w, $h, $type ) = getimagesize( $image );
 
@@ -178 +194 @@
                 $image = $this->resize_helper( DIR_TESTDATA . '/images/2007-06-17DSC_4173.JPG', 0, 96 );
 
+                $this->assertNotWPError( $image );
+
                 list( $w, $h, $type ) = getimagesize( $image );
 
@@ -191 +209 @@
                 $image = $this->resize_helper( DIR_TESTDATA . '/images/2007-06-17DSC_4173.JPG', 150, 150, true );
 
+                $this->assertNotWPError( $image );
+
                 list( $w, $h, $type ) = getimagesize( $image );
 
@@ -217 +237 @@
                 $image = $this->resize_helper( DIR_TESTDATA . '/images/2007-06-17DSC_4173.JPG', 50, 150, true );
 
+                $this->assertNotWPError( $image );
+
                 list( $w, $h, $type ) = getimagesize( $image );
 
@@ -241 +263 @@
         /**
          * 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 ) {

branches/6.7/tests/phpunit/tests/media.php

@@ -5386 +5386 @@
                 // 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'] );
@@ -5428 +5431 @@
                 // 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 ) {

branches/6.7/tools/local-env/scripts/install.js

@@ -43 +43 @@
 wait_on( { resources: [ `tcp:localhost:${process.env.LOCAL_PORT}`] } )
         .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}` );