From c57ce939f8900438f43b3e71be54482658e65747 Mon Sep 17 00:00:00 2001
From: thelovekesh <lovekesh.kumar@rtcamp.com>
Date: Fri, 26 Apr 2024 16:14:27 +0530
Subject: [PATCH 01/15] Add composer/semver package

---
 composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/composer.json b/composer.json
index 90f8a12e..88adc8cc 100644
--- a/composer.json
+++ b/composer.json
@@ -11,6 +11,7 @@
     "require": {
         "php": ">=5.6",
         "behat/behat": "^3.7",
+        "composer/semver": "^3.4",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.4.3 || ^0.5 || ^0.6.2 || ^0.7.1 || ^1.0.0",
         "php-parallel-lint/php-console-highlighter": "^1.0",
         "php-parallel-lint/php-parallel-lint": "^1.3.1",

From 7ed37f32b8da01e3375be893fc1c58d6766f9ec4 Mon Sep 17 00:00:00 2001
From: thelovekesh <lovekesh.kumar@rtcamp.com>
Date: Sat, 27 Apr 2024 23:10:41 +0530
Subject: [PATCH 02/15] Remove latest WP version resolving from run-behat-tests
 bin file

---
 bin/run-behat-tests | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/bin/run-behat-tests b/bin/run-behat-tests
index f9a09bc1..3be14534 100755
--- a/bin/run-behat-tests
+++ b/bin/run-behat-tests
@@ -19,11 +19,6 @@ if [[ "$@" == *"--help"* ]]; then
     exit $ret
 fi
 
-# Turn WP_VERSION into an actual number to make sure our tags work correctly.
-if [ "${WP_VERSION-latest}" = "latest" ]; then
-	export WP_VERSION=$(curl -s https://api.wordpress.org/core/version-check/1.7/ | jq -r ".offers[0].current")
-fi
-
 # To retrieve the WP-CLI tests package root folder, we start with this scripts
 # location.
 SOURCE="${BASH_SOURCE[0]}"

From d0aecb925cb77deea41fa2f9e9193e8891272572 Mon Sep 17 00:00:00 2001
From: thelovekesh <lovekesh.kumar@rtcamp.com>
Date: Sun, 28 Apr 2024 01:02:33 +0530
Subject: [PATCH 03/15] Add util file to be ignored from WPCS

---
 phpcs.xml.dist | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 62a1a672..4b69e816 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -63,9 +63,11 @@
 		 so this file does not have to comply with WP naming conventions. -->
 	<rule ref="WordPress.NamingConventions.PrefixAllGlobals">
 		<exclude-pattern>*/utils/behat-tags\.php$</exclude-pattern>
+		<exclude-pattern>*/utils/wp-version-resolver\.php$</exclude-pattern>
 	</rule>
 	<rule ref="WordPress.WP.GlobalVariablesOverride">
 		<exclude-pattern>*/utils/behat-tags\.php$</exclude-pattern>
+		<exclude-pattern>*/utils/wp-version-resolver\.php$</exclude-pattern>
 	</rule>
 
 	<!-- This is a procedural stand-alone file that is adding polyfills when

From fd79fd61c6348f4a24e4c804265e2cf9652afdb1 Mon Sep 17 00:00:00 2001
From: thelovekesh <lovekesh.kumar@rtcamp.com>
Date: Sun, 28 Apr 2024 01:10:37 +0530
Subject: [PATCH 04/15] Add PHP script to resolve minor and patch WP version

---
 utils/wp-version-resolver.php | 71 +++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 utils/wp-version-resolver.php

diff --git a/utils/wp-version-resolver.php b/utils/wp-version-resolver.php
new file mode 100644
index 00000000..4a79c69c
--- /dev/null
+++ b/utils/wp-version-resolver.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Resolve the WP version to use for the tests.
+ */
+
+use Composer\Semver\Semver;
+
+const WP_VERSIONS_JSON_FILE = '/wp-cli-tests-wp-versions.json';
+const WP_VERSIONS_JSON_URL  = 'https://raw.githubusercontent.com/wp-cli/wp-cli-tests/artifacts/wp-versions.json';
+
+$wp_version_env        = getenv( 'WP_VERSION' );
+$wp_versions_file_path = sys_get_temp_dir() . WP_VERSIONS_JSON_FILE;
+
+if ( ! file_exists( $wp_versions_file_path ) ) {
+	$ch = curl_init( WP_VERSIONS_JSON_URL );
+	$fp = fopen( $wp_versions_file_path, 'w' );
+
+	curl_setopt( $ch, CURLOPT_FILE, $fp );
+	curl_setopt( $ch, CURLOPT_FOLLOWLOCATION, true );
+
+	curl_exec( $ch );
+	curl_close( $ch );
+	fclose( $fp );
+}
+
+$wp_versions_json = json_decode( file_get_contents( sys_get_temp_dir() . WP_VERSIONS_JSON_FILE ), true );
+
+if ( empty( $wp_version_env ) ) {
+	echo $wp_version_env;
+	exit( 0 );
+}
+
+if ( empty( $wp_version_env ) || 'latest' === $wp_version_env ) {
+	$wp_version = array_search( 'latest', $wp_versions_json, true );
+
+	if ( empty( $wp_version ) ) {
+		$wp_version = $wp_version_env;
+	}
+
+	echo $wp_version;
+	exit( 0 );
+}
+
+$wp_version    = '';
+$constraint    = '';
+$wp_versions   = array_keys( $wp_versions_json );
+$version_count = count( explode( '.', $wp_version_env ) );
+
+if ( 1 === $version_count ) {
+	$constraint = ">=$wp_version_env"; // Get the latest minor version.
+} elseif ( 2 === $version_count ) {
+	$constraint = "~$wp_version_env.0"; // Get the latest patch version.
+} elseif ( 3 === $version_count ) {
+	$constraint = "=$wp_version_env"; // Get the exact version.
+} else {
+	$constraint = $wp_version_env;
+}
+
+if ( ! class_exists( 'Composer\Semver\Semver' ) ) {
+	require_once __DIR__ . '/../vendor/autoload.php';
+}
+
+try {
+	$wp_satisfied_versions = Semver::satisfiedBy( $wp_versions, $constraint );
+} catch ( Exception $e ) {
+	echo $wp_version_env;
+	exit( 0 );
+}
+
+$wp_version = end( $wp_satisfied_versions );
+echo $wp_version ? : $wp_version_env;

From 213e9684b46ee13948df37b4a02146e29d654b84 Mon Sep 17 00:00:00 2001
From: thelovekesh <lovekesh.kumar@rtcamp.com>
Date: Sun, 28 Apr 2024 01:10:57 +0530
Subject: [PATCH 05/15] Add step to update WP_VERSION

---
 bin/run-behat-tests | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bin/run-behat-tests b/bin/run-behat-tests
index 3be14534..6002793b 100755
--- a/bin/run-behat-tests
+++ b/bin/run-behat-tests
@@ -39,5 +39,11 @@ export WP_CLI_TESTS_ROOT
 # Generate the tags to apply environment-specific filters.
 BEHAT_TAGS=$(php "$WP_CLI_TESTS_ROOT"/utils/behat-tags.php)
 
+# Resolve WP_VERSION.
+WP_VERSION=$(php "$WP_CLI_TESTS_ROOT"/utils/wp-version-resolver.php)
+export WP_VERSION
+
+echo "Running Behat tests for WordPress $WP_VERSION"
+
 # Run the functional tests.
 vendor/bin/behat --format progress "$BEHAT_TAGS" --strict "$@"

From 52963510fcd2896777a12824c7c8f870ef677d03 Mon Sep 17 00:00:00 2001
From: thelovekesh <lovekesh.kumar@rtcamp.com>
Date: Fri, 24 May 2024 20:55:55 +0530
Subject: [PATCH 06/15] Add .phpunit.result.cache

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 4a485fb2..dcd18b14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ composer.lock
 phpunit.xml
 phpcs.xml
 .phpcs.xml
+.phpunit.result.cache

From 801b601bb174763e4429fad8de0301a867bca95f Mon Sep 17 00:00:00 2001
From: thelovekesh <lovekesh.kumar@rtcamp.com>
Date: Fri, 24 May 2024 21:04:40 +0530
Subject: [PATCH 07/15] Fix incorrect return condition

---
 utils/wp-version-resolver.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/utils/wp-version-resolver.php b/utils/wp-version-resolver.php
index 4a79c69c..7f61bc62 100644
--- a/utils/wp-version-resolver.php
+++ b/utils/wp-version-resolver.php
@@ -23,12 +23,7 @@
 	fclose( $fp );
 }
 
-$wp_versions_json = json_decode( file_get_contents( sys_get_temp_dir() . WP_VERSIONS_JSON_FILE ), true );
-
-if ( empty( $wp_version_env ) ) {
-	echo $wp_version_env;
-	exit( 0 );
-}
+$wp_versions_json = json_decode( file_get_contents( $wp_versions_file_path ), true );
 
 if ( empty( $wp_version_env ) || 'latest' === $wp_version_env ) {
 	$wp_version = array_search( 'latest', $wp_versions_json, true );

From 7d8b6710b1b9712c00e232df05fdd6d9a51a6017 Mon Sep 17 00:00:00 2001
From: thelovekesh <lovekesh.kumar@rtcamp.com>
Date: Fri, 24 May 2024 21:26:41 +0530
Subject: [PATCH 08/15] Add test cases for WP version resolver

---
 tests/test-wp-version-resolver.php | 83 ++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 tests/test-wp-version-resolver.php

diff --git a/tests/test-wp-version-resolver.php b/tests/test-wp-version-resolver.php
new file mode 100644
index 00000000..4f615c61
--- /dev/null
+++ b/tests/test-wp-version-resolver.php
@@ -0,0 +1,83 @@
+<?php
+
+use WP_CLI\Utils;
+use WP_CLI\Tests\TestCase;
+
+class WPVersionResolverTest extends TestCase {
+
+	private $temp_file;
+
+	protected function set_up() {
+		parent::set_up();
+
+		$this->temp_file =  Utils\get_temp_dir() . 'wp-cli-tests-wp-versions.json';
+
+		$fp = fopen( $this->temp_file, 'w' );
+		fwrite( $fp, json_encode( $this->wp_versions_data() ) );
+		fclose( $fp );
+	}
+
+	protected function tear_down() {
+		if ( $this->temp_file && file_exists( $this->temp_file ) ) {
+			unlink( $this->temp_file );
+		}
+
+		parent::tear_down();
+	}
+
+	private function wp_versions_data() {
+		return array(
+			'5.9' => 'insecure',
+			'5.9.1' => 'insecure',
+			'5.9.2' => 'insecure',
+			'6.0' => 'insecure',
+			'6.0.1' => 'insecure',
+			'6.0.2' => 'insecure',
+			'6.1' => 'insecure',
+			'6.1.1' => 'insecure',
+			'6.1.2' => 'insecure',
+			'6.2' => 'insecure',
+			'6.2.1' => 'insecure',
+			'6.2.2' => 'insecure',
+			'6.5' => 'insecure',
+			'6.5.2' => 'latest',
+		);
+	}
+
+	private function data_wp_version_resolver() {
+		return array(
+			array( '5.0', '5.0' ), // Does not match any version. So return as it is.
+			array( '5', '6.5.2' ), // Return the latest major version.
+			array( '5.9', '5.9.2' ), // Return the latest patch version.
+			array( '5.9.1', '5.9.1' ), // Return the exact version.
+			array( '6', '6.5.2' ), // Return the latest minor version.
+			array( '6.0', '6.0.2' ), // Return the latest patch version.
+			array( '6.0.0', '6.0' ), // Return the requested version.
+			array( '', '6.5.2' ), // Return the latest version.
+			array( 'latest', '6.5.2' ), // Return the latest version.
+			array( 'some-mismatched-version', 'some-mismatched-version' ), // Does not match any version. So return as it is.
+			array( '6.5-alpha', '6.5.2' ), // Return the latest version.
+			array( '6.5-beta', '6.5.2' ), // Return the latest version.
+			array( '6.5-rc', '6.5.2' ), // Return the latest version.
+			array( '6.5-nightly', '6.5-nightly' ), // Does not match any version. So return as it is.
+			array( '6.5.0.0', '6.5' ), // Return the latest version.
+			array( '6.5.2.0', '6.5.2' ), // Return the latest version.
+		);
+	}
+
+	/**
+	 * @dataProvider data_wp_version_resolver
+	 */
+	public function test_wp_version_resolver( $env, $expected ) {
+		if ( $env ) {
+			putenv( "WP_VERSION=$env" );
+		}
+
+		$output = exec( 'php ' . dirname( __DIR__ ) . '/utils/wp-version-resolver.php' );
+
+		$this->assertEquals( $expected, $output );
+
+		// Reset the environment variable.
+		putenv( 'WP_VERSION' );
+	}
+}

From 52c024bdb11670cccb93416832c92965a44fbc04 Mon Sep 17 00:00:00 2001
From: thelovekesh <lovekesh.kumar@rtcamp.com>
Date: Fri, 24 May 2024 21:33:29 +0530
Subject: [PATCH 09/15] Fix PHPCS errors

---
 tests/test-wp-version-resolver.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/test-wp-version-resolver.php b/tests/test-wp-version-resolver.php
index 4f615c61..21241fd2 100644
--- a/tests/test-wp-version-resolver.php
+++ b/tests/test-wp-version-resolver.php
@@ -10,7 +10,7 @@ class WPVersionResolverTest extends TestCase {
 	protected function set_up() {
 		parent::set_up();
 
-		$this->temp_file =  Utils\get_temp_dir() . 'wp-cli-tests-wp-versions.json';
+		$this->temp_file = Utils\get_temp_dir() . 'wp-cli-tests-wp-versions.json';
 
 		$fp = fopen( $this->temp_file, 'w' );
 		fwrite( $fp, json_encode( $this->wp_versions_data() ) );
@@ -27,19 +27,19 @@ protected function tear_down() {
 
 	private function wp_versions_data() {
 		return array(
-			'5.9' => 'insecure',
+			'5.9'   => 'insecure',
 			'5.9.1' => 'insecure',
 			'5.9.2' => 'insecure',
-			'6.0' => 'insecure',
+			'6.0'   => 'insecure',
 			'6.0.1' => 'insecure',
 			'6.0.2' => 'insecure',
-			'6.1' => 'insecure',
+			'6.1'   => 'insecure',
 			'6.1.1' => 'insecure',
 			'6.1.2' => 'insecure',
-			'6.2' => 'insecure',
+			'6.2'   => 'insecure',
 			'6.2.1' => 'insecure',
 			'6.2.2' => 'insecure',
-			'6.5' => 'insecure',
+			'6.5'   => 'insecure',
 			'6.5.2' => 'latest',
 		);
 	}

From b1f3131bdd721925e1b7d3d297c8b0bda5464b88 Mon Sep 17 00:00:00 2001
From: Lovekesh Kumar <lovekesh.kumar@rtcamp.com>
Date: Fri, 24 May 2024 21:46:24 +0530
Subject: [PATCH 10/15] Update assertion method to check for same values

Co-authored-by: Pascal Birchler <pascalb@google.com>
---
 tests/test-wp-version-resolver.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test-wp-version-resolver.php b/tests/test-wp-version-resolver.php
index 21241fd2..b86b35ef 100644
--- a/tests/test-wp-version-resolver.php
+++ b/tests/test-wp-version-resolver.php
@@ -75,7 +75,7 @@ public function test_wp_version_resolver( $env, $expected ) {
 
 		$output = exec( 'php ' . dirname( __DIR__ ) . '/utils/wp-version-resolver.php' );
 
-		$this->assertEquals( $expected, $output );
+		$this->assertSame( $expected, $output );
 
 		// Reset the environment variable.
 		putenv( 'WP_VERSION' );

From 5911717548f20fa523492c01f5f108e876498b19 Mon Sep 17 00:00:00 2001
From: thelovekesh <lovekesh.kumar@rtcamp.com>
Date: Fri, 24 May 2024 21:45:59 +0530
Subject: [PATCH 11/15] Fix minor version constraint

---
 utils/wp-version-resolver.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/wp-version-resolver.php b/utils/wp-version-resolver.php
index 7f61bc62..dbedd8dd 100644
--- a/utils/wp-version-resolver.php
+++ b/utils/wp-version-resolver.php
@@ -42,7 +42,7 @@
 $version_count = count( explode( '.', $wp_version_env ) );
 
 if ( 1 === $version_count ) {
-	$constraint = ">=$wp_version_env"; // Get the latest minor version.
+	$constraint = "^$wp_version_env"; // Get the latest minor version.
 } elseif ( 2 === $version_count ) {
 	$constraint = "~$wp_version_env.0"; // Get the latest patch version.
 } elseif ( 3 === $version_count ) {

From 4dc34312baa054382d422b505bef654ef8473c06 Mon Sep 17 00:00:00 2001
From: thelovekesh <lovekesh.kumar@rtcamp.com>
Date: Fri, 24 May 2024 21:52:29 +0530
Subject: [PATCH 12/15] Update test file name

---
 .../TestWPVersionResolverTest.php}            | 41 ++++++++++---------
 1 file changed, 22 insertions(+), 19 deletions(-)
 rename tests/{test-wp-version-resolver.php => tests/TestWPVersionResolverTest.php} (51%)

diff --git a/tests/test-wp-version-resolver.php b/tests/tests/TestWPVersionResolverTest.php
similarity index 51%
rename from tests/test-wp-version-resolver.php
rename to tests/tests/TestWPVersionResolverTest.php
index b86b35ef..b2504eb8 100644
--- a/tests/test-wp-version-resolver.php
+++ b/tests/tests/TestWPVersionResolverTest.php
@@ -3,7 +3,7 @@
 use WP_CLI\Utils;
 use WP_CLI\Tests\TestCase;
 
-class WPVersionResolverTest extends TestCase {
+class TestWPVersionResolverTest extends TestCase {
 
 	private $temp_file;
 
@@ -46,22 +46,22 @@ private function wp_versions_data() {
 
 	private function data_wp_version_resolver() {
 		return array(
-			array( '5.0', '5.0' ), // Does not match any version. So return as it is.
+			// array( '5.0', '5.0' ), // Does not match any version. So return as it is.
 			array( '5', '6.5.2' ), // Return the latest major version.
-			array( '5.9', '5.9.2' ), // Return the latest patch version.
-			array( '5.9.1', '5.9.1' ), // Return the exact version.
-			array( '6', '6.5.2' ), // Return the latest minor version.
-			array( '6.0', '6.0.2' ), // Return the latest patch version.
-			array( '6.0.0', '6.0' ), // Return the requested version.
-			array( '', '6.5.2' ), // Return the latest version.
-			array( 'latest', '6.5.2' ), // Return the latest version.
-			array( 'some-mismatched-version', 'some-mismatched-version' ), // Does not match any version. So return as it is.
-			array( '6.5-alpha', '6.5.2' ), // Return the latest version.
-			array( '6.5-beta', '6.5.2' ), // Return the latest version.
-			array( '6.5-rc', '6.5.2' ), // Return the latest version.
-			array( '6.5-nightly', '6.5-nightly' ), // Does not match any version. So return as it is.
-			array( '6.5.0.0', '6.5' ), // Return the latest version.
-			array( '6.5.2.0', '6.5.2' ), // Return the latest version.
+			// array( '5.9', '5.9.2' ), // Return the latest patch version.
+			// array( '5.9.1', '5.9.1' ), // Return the exact version.
+			// array( '6', '6.5.2' ), // Return the latest minor version.
+			// array( '6.0', '6.0.2' ), // Return the latest patch version.
+			// array( '6.0.0', '6.0' ), // Return the requested version.
+			// array( '', '6.5.2' ), // Return the latest version.
+			// array( 'latest', '6.5.2' ), // Return the latest version.
+			// array( 'some-mismatched-version', 'some-mismatched-version' ), // Does not match any version. So return as it is.
+			// array( '6.5-alpha', '6.5.2' ), // Return the latest version.
+			// array( '6.5-beta', '6.5.2' ), // Return the latest version.
+			// array( '6.5-rc', '6.5.2' ), // Return the latest version.
+			// array( '6.5-nightly', '6.5-nightly' ), // Does not match any version. So return as it is.
+			// array( '6.5.0.0', '6.5' ), // Return the latest version.
+			// array( '6.5.2.0', '6.5.2' ), // Return the latest version.
 		);
 	}
 
@@ -73,11 +73,14 @@ public function test_wp_version_resolver( $env, $expected ) {
 			putenv( "WP_VERSION=$env" );
 		}
 
-		$output = exec( 'php ' . dirname( __DIR__ ) . '/utils/wp-version-resolver.php' );
-
-		$this->assertSame( $expected, $output );
+		$output = exec( 'php ' . dirname( dirname( __DIR__ ) ) . '/utils/wp-version-resolver.php' );
 
 		// Reset the environment variable.
 		putenv( 'WP_VERSION' );
+
+		echo $expected;
+		echo $output;
+
+		$this->assertSame( $expected, $output );
 	}
 }

From df2d13391c8227609a828894fb8792ebbb2b729f Mon Sep 17 00:00:00 2001
From: thelovekesh <lovekesh.kumar@rtcamp.com>
Date: Fri, 24 May 2024 21:53:31 +0530
Subject: [PATCH 13/15] Update test cases for minor version assertions

---
 tests/tests/TestWPVersionResolverTest.php | 36 +++++++++++------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/tests/tests/TestWPVersionResolverTest.php b/tests/tests/TestWPVersionResolverTest.php
index b2504eb8..19546fbc 100644
--- a/tests/tests/TestWPVersionResolverTest.php
+++ b/tests/tests/TestWPVersionResolverTest.php
@@ -27,6 +27,7 @@ protected function tear_down() {
 
 	private function wp_versions_data() {
 		return array(
+			'5.4'   => 'insecure',
 			'5.9'   => 'insecure',
 			'5.9.1' => 'insecure',
 			'5.9.2' => 'insecure',
@@ -46,22 +47,22 @@ private function wp_versions_data() {
 
 	private function data_wp_version_resolver() {
 		return array(
-			// array( '5.0', '5.0' ), // Does not match any version. So return as it is.
-			array( '5', '6.5.2' ), // Return the latest major version.
-			// array( '5.9', '5.9.2' ), // Return the latest patch version.
-			// array( '5.9.1', '5.9.1' ), // Return the exact version.
-			// array( '6', '6.5.2' ), // Return the latest minor version.
-			// array( '6.0', '6.0.2' ), // Return the latest patch version.
-			// array( '6.0.0', '6.0' ), // Return the requested version.
-			// array( '', '6.5.2' ), // Return the latest version.
-			// array( 'latest', '6.5.2' ), // Return the latest version.
-			// array( 'some-mismatched-version', 'some-mismatched-version' ), // Does not match any version. So return as it is.
-			// array( '6.5-alpha', '6.5.2' ), // Return the latest version.
-			// array( '6.5-beta', '6.5.2' ), // Return the latest version.
-			// array( '6.5-rc', '6.5.2' ), // Return the latest version.
-			// array( '6.5-nightly', '6.5-nightly' ), // Does not match any version. So return as it is.
-			// array( '6.5.0.0', '6.5' ), // Return the latest version.
-			// array( '6.5.2.0', '6.5.2' ), // Return the latest version.
+			array( '5.0', '5.0' ), // Does not match any version. So return as it is.
+			array( '5', '5.9.2' ), // Return the latest major version.
+			array( '5.9', '5.9.2' ), // Return the latest patch version.
+			array( '5.9.1', '5.9.1' ), // Return the exact version.
+			array( '6', '6.5.2' ), // Return the latest minor version.
+			array( '6.0', '6.0.2' ), // Return the latest patch version.
+			array( '6.0.0', '6.0' ), // Return the requested version.
+			array( '', '6.5.2' ), // Return the latest version.
+			array( 'latest', '6.5.2' ), // Return the latest version.
+			array( 'some-mismatched-version', 'some-mismatched-version' ), // Does not match any version. So return as it is.
+			array( '6.5-alpha', '6.5.2' ), // Return the latest version.
+			array( '6.5-beta', '6.5.2' ), // Return the latest version.
+			array( '6.5-rc', '6.5.2' ), // Return the latest version.
+			array( '6.5-nightly', '6.5-nightly' ), // Does not match any version. So return as it is.
+			array( '6.5.0.0', '6.5' ), // Return the latest version.
+			array( '6.5.2.0', '6.5.2' ), // Return the latest version.
 		);
 	}
 
@@ -78,9 +79,6 @@ public function test_wp_version_resolver( $env, $expected ) {
 		// Reset the environment variable.
 		putenv( 'WP_VERSION' );
 
-		echo $expected;
-		echo $output;
-
 		$this->assertSame( $expected, $output );
 	}
 }

From aee3d2f59f9d2b091f65c43768cd05cc4b2bbec2 Mon Sep 17 00:00:00 2001
From: Lovekesh Kumar <lovekesh.kumar@rtcamp.com>
Date: Fri, 24 May 2024 21:55:57 +0530
Subject: [PATCH 14/15] Fix data provider visibility

Co-authored-by: Pascal Birchler <pascalb@google.com>
---
 tests/tests/TestWPVersionResolverTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/tests/TestWPVersionResolverTest.php b/tests/tests/TestWPVersionResolverTest.php
index 19546fbc..d07ac207 100644
--- a/tests/tests/TestWPVersionResolverTest.php
+++ b/tests/tests/TestWPVersionResolverTest.php
@@ -45,7 +45,7 @@ private function wp_versions_data() {
 		);
 	}
 
-	private function data_wp_version_resolver() {
+	public function data_wp_version_resolver() {
 		return array(
 			array( '5.0', '5.0' ), // Does not match any version. So return as it is.
 			array( '5', '5.9.2' ), // Return the latest major version.

From 2faa3d187e6be4b673ce10e0f49bdc55a1a8acfa Mon Sep 17 00:00:00 2001
From: thelovekesh <lovekesh.kumar@rtcamp.com>
Date: Fri, 24 May 2024 22:48:20 +0530
Subject: [PATCH 15/15] Make the data providers static

---
 tests/tests/TestWPVersionResolverTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/tests/TestWPVersionResolverTest.php b/tests/tests/TestWPVersionResolverTest.php
index d07ac207..f91aafd2 100644
--- a/tests/tests/TestWPVersionResolverTest.php
+++ b/tests/tests/TestWPVersionResolverTest.php
@@ -45,7 +45,7 @@ private function wp_versions_data() {
 		);
 	}
 
-	public function data_wp_version_resolver() {
+	public static function data_wp_version_resolver() {
 		return array(
 			array( '5.0', '5.0' ), // Does not match any version. So return as it is.
 			array( '5', '5.9.2' ), // Return the latest major version.