Changeset 60744 for branches/6.8/tests/phpunit/tests/image/resize.php

Timestamp:

09/15/2025 07:15:41 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.8 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.8 branch.

See #63876, #63932.

Location:

branches/6.8

Files:

• . (modified) (1 prop)
• tests/phpunit/tests/image/resize.php (modified) (11 diffs)

branches/6.8/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 ) {