Ticket #51228: 51228-avif-compat-php.2.diff

src/wp-includes/class-wp-image-editor-gd.php

@@ -71 +71 @@
                                 return ( $image_types & IMG_GIF ) != 0;
                         case 'image/webp':
                                 return ( $image_types & IMG_WEBP ) != 0;
+                        case 'image/avif':
+                                return ( $image_types & IMG_AVIF ) != 0;
                 }
 
                 return false;

src/wp-includes/compat.php

@@ -497 +497 @@
 if ( ! defined( 'IMG_WEBP' ) ) {
         define( 'IMG_WEBP', IMAGETYPE_WEBP );
 }
+
+// IMAGETYPE_AVIF constant is only defined in PHP 8.x or later.
+if ( ! defined( 'IMAGETYPE_AVIF' ) ) {
+        define( 'IMAGETYPE_AVIF', 19 );
+}
+
+// IMG_AVIF constant is only defined in PHP 8.x or later.
+if ( ! defined( 'IMG_AVIF' ) ) {
+        define( 'IMG_AVIF', IMAGETYPE_AVIF );
+}

tests/phpunit/tests/image/editorGd.php

@@ -51 +51 @@
                 $this->assertSame( $expected, $gd_image_editor->supports_mime_type( 'image/gif' ) );
         }
 
+        public function test_supports_mime_type_webp() {
+                $gd_image_editor = new WP_Image_Editor_GD( null );
+                $expected        = (bool) ( imagetypes() & IMG_WEBP );
+                $this->assertSame( $expected, $gd_image_editor->supports_mime_type( 'image/webp' ) );
+        }
+
+        public function test_supports_mime_type_avif() {
+                $gd_image_editor = new WP_Image_Editor_GD( null );
+                $expected        = (bool) ( imagetypes() & IMG_AVIF );
+                $this->assertSame( $expected, $gd_image_editor->supports_mime_type( 'image/avif' ) );
+        }
+
         /**
          * Tests resizing an image, not using crop.
          *