Changeset 61328

Timestamp:

12/01/2025 12:34:20 AM (4 weeks ago)

Author:

desrosj

Message:

Media: Adjustments for official HEIF/HEIC support in added in PHP 8.5.

Now that a version of imagick with support for PHP 8.5 has been released and the containers maintained by the project for the local development environemnt have been updated to include it, there are some new PHP 8.5 compatibility issues that have surfaced related to HEIF/HEIC image format.

PHP 8.5 added support for the HEIF/HEIC image format in getimagesize(). To properly support this in a cross-version way, a few changes are necessary.

Since [58849], WordPress has supported this format and the IMAGETYPE_HEIC constant was introduced as a placeholder until proper support was added in PHP. Since that has now happened, this constant needs to be changed to contain a value of 20 instead of 99, and the name upstream was added as IMAGETYPE_HEIF. The constant in Core is being changed to match those included in PHP.

The implementation for this image format in getimagesize() also follows a similar pattern to that of AVIF where additional information such as the image bits and channels are also returned. This additional information is causing unit tests to fail. The tests have been updated to account for different versions of PHP returning a different level of detail.

Props westonruter, skithund, johnbillion, adamsilverstein.
Fixes #64322.

Location:

trunk

Files:

• src/wp-includes/compat.php (modified) (1 diff)
• src/wp-includes/media.php (modified) (1 diff)
• tests/phpunit/tests/functions.php (modified) (1 diff)

trunk/src/wp-includes/compat.php

@@ -615 +615 @@
 }
 
-// IMAGETYPE_HEIC constant is not yet defined in PHP as of PHP 8.3.
-if ( ! defined( 'IMAGETYPE_HEIC' ) ) {
-    define( 'IMAGETYPE_HEIC', 99 );
-}
+// IMAGETYPE_HEIF constant is only defined in PHP 8.5 or later.
+if ( ! defined( 'IMAGETYPE_HEIF' ) ) {
+    define( 'IMAGETYPE_HEIF', 20 );
+}

trunk/src/wp-includes/media.php

@@ -5830 +5830 @@
                 $size['width'],
                 $size['height'],
-                IMAGETYPE_HEIC,
+                IMAGETYPE_HEIF,
                 sprintf(
                     'width="%d" height="%d"',

trunk/tests/phpunit/tests/functions.php

@@ -1574 +1574 @@
             1180,
             1180,
-            IMAGETYPE_HEIC,
+            IMAGETYPE_HEIF,
             'width="1180" height="1180"',
-            'mime' => 'image/heic',
-        );
-        $result   = wp_getimagesize( $file );
+        );
+
+        // As of PHP 8.5.0, getimagesize() supports HEIF/HEIC files.
+        if ( PHP_VERSION_ID >= 80500 ) {
+            $expected = array_merge(
+                $expected,
+                array(
+                    'bits'        => 8,
+                    'channels'    => 3,
+                    'mime'        => 'image/heif',
+                    'width_unit'  => 'px',
+                    'height_unit' => 'px',
+                )
+            );
+        } else {
+            $expected['mime'] = 'image/heic';
+        }
+
+        $result = wp_getimagesize( $file );
         $this->assertSame( $expected, $result );
     }