<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[55498] Tests: Adjust the expected mime type for WOFF fonts on PHP 8.1.12+.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/55498">55498</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/55498","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-03-09 14:04:51 +0000 (Thu, 09 Mar 2023)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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:
* [https://github.com/php/php-src/issues/8805 php-src: <a href="https://core.trac.wordpress.org/ticket/8805">#8805</a>: finfo returns wrong mime type for woff/woff2 files]
* [https://www.php.net/ChangeLog-8.php<a href="https://core.trac.wordpress.org/ticket/8">#8</a>.1.12 PHP 8.1.12 changelog]
Follow-up to <a href="https://core.trac.wordpress.org/changeset/40124">[40124]</a>, <a href="https://core.trac.wordpress.org/changeset/54508">[54508]</a>, <a href="https://core.trac.wordpress.org/changeset/54509">[54509]</a>, <a href="https://core.trac.wordpress.org/changeset/54724">[54724]</a>.
Props desrosj, jrf, costdev, SergeyBiryukov.
Merges <a href="https://core.trac.wordpress.org/changeset/55462">[55462]</a> to the 5.9 branch.
Fixes <a href="https://core.trac.wordpress.org/ticket/56817">#56817</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches59testsphpunittestsfunctionsphp">branches/5.9/tests/phpunit/tests/functions.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches59">branches/5.9/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/5.9
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/5.9 2023-03-09 14:04:12 UTC (rev 55497)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/5.9 2023-03-09 14:04:51 UTC (rev 55498)
</ins><a id="branches59"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/5.9</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43747,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43785,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43863,43867-43889,43891-43894,43897-43905,43908-43909,43911-43929,43931-43942,43946-43947,43949-43956,43959-43964,43967-43969,43988,43994,44014,44017,44047,44183,44185,44187-44206,44208-44213,44231-44232,44235,44248,44284,44287-44288
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.5:49373-49379,49381
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.8:51889
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:52453-52457,52535-52536,52547,52555,52558,52562-52563,52574,52589,52612-52613,52618,52626,52628,52631,52633,52637,52644,52648,52651,52656,52658,52662,52664,52668,52672-52673,52675-52677,52679,52681-52682,52686,52692,52694-52695,52697,52726,52730,52733-52735,52738,52741,52743-52744,52750,52752,52754,52757,52760,52763,52765,52768,52781,52791,52797,52802,52807,52819,52844,52895,52939,52995,53012,53015,53020,53024-53025,53112,53349,53581-53582,53592,53665,53958-53960,54217,54322,54397,54521-54530,54541,54675,54968,55350
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:52453-52457,52535-52536,52547,52555,52558,52562-52563,52574,52589,52612-52613,52618,52626,52628,52631,52633,52637,52644,52648,52651,52656,52658,52662,52664,52668,52672-52673,52675-52677,52679,52681-52682,52686,52692,52694-52695,52697,52726,52730,52733-52735,52738,52741,52743-52744,52750,52752,52754,52757,52760,52763,52765,52768,52781,52791,52797,52802,52807,52819,52844,52895,52939,52995,53012,53015,53020,53024-53025,53112,53349,53581-53582,53592,53665,53958-53960,54217,54322,54397,54521-54530,54541,54675,54968,55350,55462
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches59testsphpunittestsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.9/tests/phpunit/tests/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.9/tests/phpunit/tests/functions.php 2023-03-09 14:04:12 UTC (rev 55497)
+++ branches/5.9/tests/phpunit/tests/functions.php 2023-03-09 14:04:51 UTC (rev 55498)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1443,11 +1443,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'proper_filename' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'upload_mimes', array( $this, 'filter_mime_types_svg' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter(
+ 'upload_mimes',
+ static function( $mimes ) {
+ $mimes['svg'] = 'image/svg+xml';
+ return $mimes;
+ }
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, wp_check_filetype_and_ext( $file, $filename ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- // Cleanup.
- remove_filter( 'upload_mimes', array( $this, 'filter_mime_types_svg' ) );
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1459,29 +1463,35 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/uploads/dashicons.woff';
</span><span class="cx" style="display: block; padding: 0 10px"> $filename = 'dashicons.woff';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $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';
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'ext' => 'woff',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'type' => 'application/font-woff',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'type' => $woff_mime_type,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'proper_filename' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'upload_mimes', array( $this, 'filter_mime_types_woff' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter(
+ 'upload_mimes',
+ static function( $mimes ) use ( $woff_mime_type ) {
+ $mimes['woff'] = $woff_mime_type;
+ return $mimes;
+ }
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, wp_check_filetype_and_ext( $file, $filename ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- // Cleanup.
- remove_filter( 'upload_mimes', array( $this, 'filter_mime_types_woff' ) );
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 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;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Data provider for test_wp_get_image_mime().
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre>
</div>
</div>
</body>
</html>