Skip to content

Commit b15bb67

Browse files
Site Health: Bump the recommended MariaDB version.
MariaDB 10.4 reaches EOL (“End of Life”) 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 [55665], [52420], [53435], [54069], [54076]. Props peterwilsoncc, dd32, costdev, mukesh27, hellofromTonya. Fixes #61458. See #meta7679. git-svn-id: https://develop.svn.wordpress.org/trunk@58432 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 19684ed commit b15bb67

File tree

3 files changed

+2
-8
lines changed

3 files changed

+2
-8
lines changed

src/readme.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ <h2>System Requirements</h2>
5858
<h3>Recommendations</h3>
5959
<ul>
6060
<li><a href="https://www.php.net/">PHP</a> version <strong>7.4</strong> or greater.</li>
61-
<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>
61+
<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>
6262
<li>The <a href="https://httpd.apache.org/docs/2.2/mod/mod_rewrite.html">mod_rewrite</a> Apache module.</li>
6363
<li><a href="https://wordpress.org/news/2016/12/moving-toward-ssl/">HTTPS</a> support.</li>
6464
<li>A link to <a href="https://wordpress.org/">wordpress.org</a> on your site.</li>

src/wp-admin/includes/class-wp-site-health.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class WP_Site_Health {
1818
private $mysql_server_version = '';
1919
private $mysql_required_version = '5.5';
2020
private $mysql_recommended_version = '8.0';
21-
private $mariadb_recommended_version = '10.4';
21+
private $mariadb_recommended_version = '10.5';
2222

2323
public $php_memory_limit;
2424

tests/phpunit/tests/admin/wpSiteHealth.php

-6
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ public function set_up() {
3838
* @covers ::__construct()
3939
*/
4040
public function test_mysql_recommended_version_matches_readme_html() {
41-
// This test is designed to only run on trunk.
42-
$this->skipOnAutomatedBranches();
43-
4441
$reflection = new ReflectionClass( $this->instance );
4542
$reflection_property = $reflection->getProperty( 'mysql_recommended_version' );
4643
$reflection_property->setAccessible( true );
@@ -57,9 +54,6 @@ public function test_mysql_recommended_version_matches_readme_html() {
5754
* @covers ::__construct()
5855
*/
5956
public function test_mariadb_recommended_version_matches_readme_html() {
60-
// This test is designed to only run on trunk.
61-
$this->skipOnAutomatedBranches();
62-
6357
$reflection = new ReflectionClass( $this->instance );
6458
$reflection_property = $reflection->getProperty( 'mariadb_recommended_version' );
6559
$reflection_property->setAccessible( true );

0 commit comments

Comments
 (0)