From bc161e6c8237e1a0a9fc8174f965cc6ca98d80b3 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Mon, 23 May 2022 14:20:47 +0000
Subject: [PATCH] General: Bump the recommended MariaDB version in
 `readme.html`.

MariaDB 10.2 has reached EOL in May 2022. The recommended minimum is bumped to 10.3 for now.

Follow-up to [52319], [52358], [52420], [52424], [53431], [53433], [meta11866].

Props hellofromTonya.
Fixes #55791. See #meta6322.

git-svn-id: https://develop.svn.wordpress.org/trunk@53435 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/readme.html                             | 2 +-
 tests/phpunit/tests/external-http/basic.php | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/readme.html b/src/readme.html
index d9840bd2de..20272c19bf 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.2</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.3</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/tests/phpunit/tests/external-http/basic.php b/tests/phpunit/tests/external-http/basic.php
index bb7415b2af..437e93b469 100644
--- a/tests/phpunit/tests/external-http/basic.php
+++ b/tests/phpunit/tests/external-http/basic.php
@@ -64,13 +64,6 @@ class Tests_External_HTTP_Basic extends WP_UnitTestCase {
 	 * @covers ::wp_remote_retrieve_body
 	 */
 	public function test_readme_mariadb_version() {
-		/*
-		 * Temporary skip as MariaDB 10.2 is EOL as of 23 May 2022.
-		 * See Trac #55791 and meta #6322.
-		 * Once the version is bumped, revert this change.
-		 */
-		$this->markTestSkipped( 'Temporarily skip due to MariaDB 10.2 now EOL as of 23 May 2022. Remove this skip once version is bumped.' );
-
 		// This test is designed to only run on trunk.
 		$this->skipOnAutomatedBranches();