<!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>[58432] trunk: Site Health: Bump the recommended MariaDB version.</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/58432">58432</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/58432","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>hellofromTonya</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-06-18 11:57:41 +0000 (Tue, 18 Jun 2024)</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'>Site Health: Bump the recommended MariaDB version.
MariaDB 10.4 reaches EOL ({U+201C}End of Life{U+201D}) on 18 June 2024. The recommended minimum is bumped to 10.5 for now, whose EOL is 24 June 2025.
Also removes the skip in tests to allow the tests to run on all branches with this change.
References:
* [https://mariadb.org/about/#maintenance-policy MySQL Support Policies]
* [https://make.wordpress.org/hosting/handbook/server-environment/#database Hosting team handbook: Server Environment: Database]
Follow-up to <a href="https://core.trac.wordpress.org/changeset/55665">[55665]</a>, <a href="https://core.trac.wordpress.org/changeset/52420">[52420]</a>, <a href="https://core.trac.wordpress.org/changeset/53435">[53435]</a>, <a href="https://core.trac.wordpress.org/changeset/54069">[54069]</a>, <a href="https://core.trac.wordpress.org/changeset/54076">[54076]</a>.
Props peterwilsoncc, dd32, costdev, mukesh27, hellofromTonya.
Fixes <a href="https://core.trac.wordpress.org/ticket/61458">#61458</a>.
See #meta7679.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcreadmehtml">trunk/src/readme.html</a></li>
<li><a href="#trunksrcwpadminincludesclasswpsitehealthphp">trunk/src/wp-admin/includes/class-wp-site-health.php</a></li>
<li><a href="#trunktestsphpunittestsadminwpSiteHealthphp">trunk/tests/phpunit/tests/admin/wpSiteHealth.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcreadmehtml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/readme.html</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/readme.html 2024-06-18 10:49:29 UTC (rev 58431)
+++ trunk/src/readme.html 2024-06-18 11:57:41 UTC (rev 58432)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,7 +58,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <h3>Recommendations</h3>
</span><span class="cx" style="display: block; padding: 0 10px"> <ul>
</span><span class="cx" style="display: block; padding: 0 10px"> <li><a href="https://www.php.net/">PHP</a> version <strong>7.4</strong> or greater.</li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li><a href="https://www.mysql.com/">MySQL</a> version <strong>8.0</strong> or greater OR <a href="https://mariadb.org/">MariaDB</a> version <strong>10.4</strong> or greater.</li>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li><a href="https://www.mysql.com/">MySQL</a> version <strong>8.0</strong> or greater OR <a href="https://mariadb.org/">MariaDB</a> version <strong>10.5</strong> or greater.</li>
</ins><span class="cx" style="display: block; padding: 0 10px"> <li>The <a href="https://httpd.apache.org/docs/2.2/mod/mod_rewrite.html">mod_rewrite</a> Apache module.</li>
</span><span class="cx" style="display: block; padding: 0 10px"> <li><a href="https://wordpress.org/news/2016/12/moving-toward-ssl/">HTTPS</a> support.</li>
</span><span class="cx" style="display: block; padding: 0 10px"> <li>A link to <a href="https://wordpress.org/">wordpress.org</a> on your site.</li>
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpsitehealthphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-site-health.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-site-health.php 2024-06-18 10:49:29 UTC (rev 58431)
+++ trunk/src/wp-admin/includes/class-wp-site-health.php 2024-06-18 11:57:41 UTC (rev 58432)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,7 +18,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> private $mysql_server_version = '';
</span><span class="cx" style="display: block; padding: 0 10px"> private $mysql_required_version = '5.5';
</span><span class="cx" style="display: block; padding: 0 10px"> private $mysql_recommended_version = '8.0';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- private $mariadb_recommended_version = '10.4';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private $mariadb_recommended_version = '10.5';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public $php_memory_limit;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsadminwpSiteHealthphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/admin/wpSiteHealth.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/wpSiteHealth.php 2024-06-18 10:49:29 UTC (rev 58431)
+++ trunk/tests/phpunit/tests/admin/wpSiteHealth.php 2024-06-18 11:57:41 UTC (rev 58432)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,9 +38,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::__construct()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_mysql_recommended_version_matches_readme_html() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // This test is designed to only run on trunk.
- $this->skipOnAutomatedBranches();
-
</del><span class="cx" style="display: block; padding: 0 10px"> $reflection = new ReflectionClass( $this->instance );
</span><span class="cx" style="display: block; padding: 0 10px"> $reflection_property = $reflection->getProperty( 'mysql_recommended_version' );
</span><span class="cx" style="display: block; padding: 0 10px"> $reflection_property->setAccessible( true );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,9 +54,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::__construct()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_mariadb_recommended_version_matches_readme_html() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // This test is designed to only run on trunk.
- $this->skipOnAutomatedBranches();
-
</del><span class="cx" style="display: block; padding: 0 10px"> $reflection = new ReflectionClass( $this->instance );
</span><span class="cx" style="display: block; padding: 0 10px"> $reflection_property = $reflection->getProperty( 'mariadb_recommended_version' );
</span><span class="cx" style="display: block; padding: 0 10px"> $reflection_property->setAccessible( true );
</span></span></pre>
</div>
</div>
</body>
</html>