Changeset 55497

Timestamp:

03/09/2023 02:04:12 PM (3 years ago)

Author:

SergeyBiryukov

Message:

Tests: Adjust the expected mime type for WOFF fonts on PHP 8.1.12+.

As of PHP 8.1.12, which includes libmagic/file update to version 5.42, the expected mime type for WOFF files has changed to font/woff, so the type needs to be adjusted accordingly in wp_check_filetype_and_ext() tests.

References:

• ​php-src: #8805: finfo returns wrong mime type for woff/woff2 files
• ​PHP 8.1.12 changelog

Follow-up to [40124], [54508], [54509], [54724].

Props desrosj, jrf, costdev, SergeyBiryukov.
Merges [55462] to the 6.0 branch.
Fixes #56817.

Location:

branches/6.0

Files:

• . (modified) (1 prop)
• tests/phpunit/tests/functions.php (modified) (2 diffs)

branches/6.0/tests/phpunit/tests/functions.php

@@ -1476 +1476 @@
                 );
 
-                add_filter( 'upload_mimes', array( $this, 'filter_mime_types_svg' ) );
+                add_filter(
+                        'upload_mimes',
+                        static function( $mimes ) {
+                                $mimes['svg'] = 'image/svg+xml';
+                                return $mimes;
+                        }
+                );
+
                 $this->assertSame( $expected, wp_check_filetype_and_ext( $file, $filename ) );
-
-                // Cleanup.
-                remove_filter( 'upload_mimes', array( $this, 'filter_mime_types_svg' ) );
         }
 
@@ -1492 +1496 @@
                 $filename = 'dashicons.woff';
 
+                $woff_mime_type = 'application/font-woff';
+
+                /*
+                 * As of PHP 8.1.12, which includes libmagic/file update to version 5.42,
+                 * the expected mime type for WOFF files is 'font/woff'.
+                 *
+                 * See https://github.com/php/php-src/issues/8805.
+                 */
+                if ( PHP_VERSION_ID >= 80112 ) {
+                        $woff_mime_type = 'font/woff';
+                }
+
                 $expected = array(
                         'ext'             => 'woff',
-                        'type'            => 'application/font-woff',
+                        'type'            => $woff_mime_type,
                         'proper_filename' => false,
                 );
 
-                add_filter( 'upload_mimes', array( $this, 'filter_mime_types_woff' ) );
+                add_filter(
+                        'upload_mimes',
+                        static function( $mimes ) use ( $woff_mime_type ) {
+                                $mimes['woff'] = $woff_mime_type;
+                                return $mimes;
+                        }
+                );
+
                 $this->assertSame( $expected, wp_check_filetype_and_ext( $file, $filename ) );
-
-                // Cleanup.
-                remove_filter( 'upload_mimes', array( $this, 'filter_mime_types_woff' ) );
-        }
-
-        public function filter_mime_types_svg( $mimes ) {
-                $mimes['svg'] = 'image/svg+xml';
-                return $mimes;
-        }
-
-        public function filter_mime_types_woff( $mimes ) {
-                $mimes['woff'] = 'application/font-woff';
-                return $mimes;
         }