<!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>[54069] trunk: Site Health: Bump the recommended MySQL and MariaDB versions.</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/54069">54069</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/54069","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>2022-09-05 15:18:13 +0000 (Mon, 05 Sep 2022)</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 MySQL and MariaDB versions.
* MySQL 5.6 has reached EOL ({U+201C}End of Life{U+201D}) in February 2021. The recommended minimum is bumped to 5.7 for now.
* MariaDB 10.2 has reached EOL in May 2022. The recommended minimum is bumped to 10.3 for now.
This commit brings the Site Health recommendations in line with `readme.html`.
Includes:
* Adding two unit tests to ensure the SQL server versions recommended by Site Health match `readme.html`.
* Consistently declaring the recommended and required versions as the `WP_Site_Health` class properties.
* Renaming some pre-existing private properties for clarity.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/44986">[44986]</a>, <a href="https://core.trac.wordpress.org/changeset/52319">[52319]</a>, <a href="https://core.trac.wordpress.org/changeset/52358">[52358]</a>, <a href="https://core.trac.wordpress.org/changeset/52420">[52420]</a>, <a href="https://core.trac.wordpress.org/changeset/52424">[52424]</a>, <a href="https://core.trac.wordpress.org/changeset/53431">[53431]</a>, <a href="https://core.trac.wordpress.org/changeset/53433">[53433]</a>, <a href="https://core.trac.wordpress.org/changeset/53435">[53435]</a>, [meta11407], [meta11866].
See <a href="https://core.trac.wordpress.org/ticket/55791">#55791</a>, #meta5999, #meta6322.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpsitehealthphp">trunk/src/wp-admin/includes/class-wp-site-health.php</a></li>
<li><a href="#trunktestsphpunittestssitehealthphp">trunk/tests/phpunit/tests/site-health.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2022-09-05 14:31:05 UTC (rev 54068)
+++ trunk/src/wp-admin/includes/class-wp-site-health.php 2022-09-05 15:18:13 UTC (rev 54069)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,13 +10,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class WP_Site_Health {
</span><span class="cx" style="display: block; padding: 0 10px"> private static $instance = null;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- private $mysql_min_version_check;
- private $mysql_rec_version_check;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private $is_acceptable_mysql_version;
+ private $is_recommended_mysql_version;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public $is_mariadb = false;
- private $mysql_server_version = '';
- private $health_check_mysql_required_version = '5.5';
- private $health_check_mysql_rec_version = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public $is_mariadb = false;
+ private $mysql_server_version = '';
+ private $mysql_required_version = '5.5';
+ private $mysql_recommended_version = '5.7';
+ private $mariadb_recommended_version = '10.3';
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,15 +210,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->mysql_server_version = $wpdb->get_var( 'SELECT VERSION()' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->health_check_mysql_rec_version = '5.6';
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( stristr( $mysql_server_type, 'mariadb' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->is_mariadb = true;
- $this->health_check_mysql_rec_version = '10.0';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->is_mariadb = true;
+ $this->mysql_recommended_version = $this->mariadb_recommended_version;
</ins><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">- $this->mysql_min_version_check = version_compare( '5.5', $this->mysql_server_version, '<=' );
- $this->mysql_rec_version_check = version_compare( $this->health_check_mysql_rec_version, $this->mysql_server_version, '<=' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->is_acceptable_mysql_version = version_compare( $this->mysql_required_version, $this->mysql_server_version, '<=' );
+ $this->is_recommended_mysql_version = version_compare( $this->mysql_recommended_version, $this->mysql_server_version, '<=' );
</ins><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">@@ -1197,7 +1196,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $db_dropin = file_exists( WP_CONTENT_DIR . '/db.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $this->mysql_rec_version_check ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $this->is_recommended_mysql_version ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result['status'] = 'recommended';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result['label'] = __( 'Outdated SQL server' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1208,12 +1207,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: The database engine in use (MySQL or MariaDB). 2: Database server recommended version number. */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'For optimal performance and security reasons, you should consider running %1$s version %2$s or higher. Contact your web hosting company to correct this.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> ( $this->is_mariadb ? 'MariaDB' : 'MySQL' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->health_check_mysql_rec_version
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->mysql_recommended_version
</ins><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="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $this->mysql_min_version_check ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $this->is_acceptable_mysql_version ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result['status'] = 'critical';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result['label'] = __( 'Severely outdated SQL server' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1225,7 +1224,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: The database engine in use (MySQL or MariaDB). 2: Database server minimum version number. */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'WordPress requires %1$s version %2$s or higher. Contact your web hosting company to correct this.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> ( $this->is_mariadb ? 'MariaDB' : 'MySQL' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->health_check_mysql_required_version
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->mysql_required_version
</ins><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></pre></div>
<a id="trunktestsphpunittestssitehealthphp"></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/site-health.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/site-health.php 2022-09-05 14:31:05 UTC (rev 54068)
+++ trunk/tests/phpunit/tests/site-health.php 2022-09-05 15:18:13 UTC (rev 54069)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,6 +12,52 @@
</span><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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket 55791
+ * @covers ::prepare_sql_data()
+ * @covers ::get_test_sql_server()
+ */
+ public function test_mysql_recommended_version_matches_readme_html() {
+ // This test is designed to only run on trunk.
+ $this->skipOnAutomatedBranches();
+
+ $wp_site_health = new WP_Site_Health();
+ $wp_site_health->get_test_sql_server();
+
+ $reflection = new ReflectionClass( $wp_site_health );
+ $reflection_property = $reflection->getProperty( 'mysql_recommended_version' );
+ $reflection_property->setAccessible( true );
+
+ $readme = file_get_contents( ABSPATH . 'readme.html' );
+
+ preg_match( '#Recommendations.*MySQL</a> version <strong>([0-9.]*)#s', $readme, $matches );
+
+ $this->assertSame( $matches[1], $reflection_property->getValue( $wp_site_health ) );
+ }
+
+ /**
+ * @ticket 55791
+ * @covers ::prepare_sql_data()
+ * @covers ::get_test_sql_server()
+ */
+ public function test_mariadb_recommended_version_matches_readme_html() {
+ // This test is designed to only run on trunk.
+ $this->skipOnAutomatedBranches();
+
+ $wp_site_health = new WP_Site_Health();
+ $wp_site_health->get_test_sql_server();
+
+ $reflection = new ReflectionClass( $wp_site_health );
+ $reflection_property = $reflection->getProperty( 'mariadb_recommended_version' );
+ $reflection_property->setAccessible( true );
+
+ $readme = file_get_contents( ABSPATH . 'readme.html' );
+
+ preg_match( '#Recommendations.*MariaDB</a> version <strong>([0-9.]*)#s', $readme, $matches );
+
+ $this->assertSame( $matches[1], $reflection_property->getValue( $wp_site_health ) );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Ensure Site Health reports correctly cron job reports.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 47223
</span></span></pre>
</div>
</div>
</body>
</html>