From f597832f53924dc31eebbe51957f7179ce578637 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Sun, 22 Oct 2023 09:03:12 +0000
Subject: [PATCH] General: Bump the recommended MySQL version in `readme.html`.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

MySQL 5.7 reaches EOL (“End of Life”) in October 2023. The recommended minimum is bumped to 8.0 for now.

References:
* [https://www.mysql.com/support/ MySQL Support Policies]
* [https://make.wordpress.org/hosting/handbook/server-environment/#database Hosting team handbook: Server Environment: Database]

Follow-up to [31291], [33946], [35759], [52420], [52421], [54069].

Props swissspidy, SergeyBiryukov.
See #59701.

git-svn-id: https://develop.svn.wordpress.org/trunk@56982 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/readme.html                                | 2 +-
 src/wp-admin/includes/class-wp-site-health.php | 2 +-
 tests/phpunit/tests/readme.php                 | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/readme.html b/src/readme.html
index a40c5e98a9..4c76fd4c17 100644
--- a/src/readme.html
+++ b/src/readme.html
@@ -58,7 +58,7 @@
 <h3>Recommendations</h3>
 <ul>
 	<li><a href="https://secure.php.net/">PHP</a> version <strong>7.4</strong> or greater.</li>
-	<li><a href="https://www.mysql.com/">MySQL</a> version <strong>5.7</strong> or greater OR <a href="https://mariadb.org/">MariaDB</a> version <strong>10.4</strong> or greater.</li>
+	<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>
 	<li>The <a href="https://httpd.apache.org/docs/2.2/mod/mod_rewrite.html">mod_rewrite</a> Apache module.</li>
 	<li><a href="https://wordpress.org/news/2016/12/moving-toward-ssl/">HTTPS</a> support.</li>
 	<li>A link to <a href="https://wordpress.org/">wordpress.org</a> on your site.</li>
diff --git a/src/wp-admin/includes/class-wp-site-health.php b/src/wp-admin/includes/class-wp-site-health.php
index b73e1e78a0..39b4d0ad56 100644
--- a/src/wp-admin/includes/class-wp-site-health.php
+++ b/src/wp-admin/includes/class-wp-site-health.php
@@ -17,7 +17,7 @@ class WP_Site_Health {
 	public $is_mariadb                   = false;
 	private $mysql_server_version        = '';
 	private $mysql_required_version      = '5.5';
-	private $mysql_recommended_version   = '5.7';
+	private $mysql_recommended_version   = '8.0';
 	private $mariadb_recommended_version = '10.4';
 
 	public $php_memory_limit;
diff --git a/tests/phpunit/tests/readme.php b/tests/phpunit/tests/readme.php
index f0068d821e..7ec762b665 100644
--- a/tests/phpunit/tests/readme.php
+++ b/tests/phpunit/tests/readme.php
@@ -48,11 +48,11 @@ class Tests_Readme extends WP_UnitTestCase {
 		/*
 		 * Per https://www.mysql.com/support/, Oracle actively supports MySQL releases for 5 years from GA release.
 		 *
-		 * The currently recommended MySQL 5.7 branch moved from active support to extended support on 2020-10-21.
-		 * As WordPress core is not fully compatible with MySQL 8.0 at this time, the "supported" period here
+		 * The currently recommended MySQL 8.0 branch moved from active support to extended support on 2023-04-19.
+		 * As WordPress core may not be fully compatible with MySQL 8.1 at this time, the "supported" period here
 		 * is increased to 8 years to include extended support.
 		 *
-		 * TODO: Reduce this back to 5 years once MySQL 8.0 compatibility is achieved.
+		 * TODO: Reduce this back to 5 years once MySQL 8.1 compatibility is achieved.
 		 */
 		$mysql_eol    = gmdate( 'Y-m-d', strtotime( $mysql_matches[1] . ' +8 years' ) );
 		$current_date = gmdate( 'Y-m-d' );