From 1c5a9e67e8c4f719e318030679ff3fdbdad05526 Mon Sep 17 00:00:00 2001
From: Daniel Bachhuber <daniel.bachhuber@automattic.com>
Date: Thu, 2 Mar 2023 15:23:46 -0800
Subject: [PATCH 1/2] Ensure a stable version is used when `--minor` or
 `--patch` specified

---
 src/WP_CLI/CommandWithUpgrade.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/WP_CLI/CommandWithUpgrade.php b/src/WP_CLI/CommandWithUpgrade.php
index 325a1a6dd..1c93e5d59 100755
--- a/src/WP_CLI/CommandWithUpgrade.php
+++ b/src/WP_CLI/CommandWithUpgrade.php
@@ -2,6 +2,7 @@
 
 namespace WP_CLI;
 
+use Composer\Package\Version\VersionParser;
 use Composer\Semver\Comparator;
 use Exception;
 use WP_CLI;
@@ -351,7 +352,7 @@ protected function update_many( $args, $assoc_args ) {
 			$type     = $minor ? 'minor' : 'patch';
 			$insecure = (bool) Utils\get_flag_value( $assoc_args, 'insecure', false );
 
-			$items_to_update = self::get_minor_or_patch_updates( $items_to_update, $type, $insecure );
+			$items_to_update = self::get_minor_or_patch_updates( $items_to_update, $type, $insecure, true );
 		}
 
 		$exclude = Utils\get_flag_value( $assoc_args, 'exclude' );
@@ -610,9 +611,10 @@ private function get_color( $status ) {
 	 * @param array  $items    Plugins with updates.
 	 * @param string $type     Either 'minor' or 'patch'.
 	 * @param bool   $insecure Whether to retry without certificate validation on TLS handshake failure.
+	 * @param bool   $require_stable Whether to require stable version when comparing versions.
 	 * @return array
 	 */
-	private function get_minor_or_patch_updates( $items, $type, $insecure ) {
+	private function get_minor_or_patch_updates( $items, $type, $insecure, $require_stable ) {
 		$wp_org_api = new WpOrgApi( [ 'insecure' => $insecure ] );
 		foreach ( $items as $i => $item ) {
 			try {
@@ -642,6 +644,10 @@ private function get_minor_or_patch_updates( $items, $type, $insecure ) {
 				if ( 'minor' === $type && ! in_array( $update_type, array( 'minor', 'patch' ), true ) ) {
 					continue;
 				}
+				if ( $require_stable && 'stable' !== VersionParser::parseStability( $version ) ) {
+					continue;
+				}
+
 				if ( $update_version && ! Comparator::greaterThan( $version, $update_version ) ) {
 					continue;
 				}

From ec595c9cefcb1e988b6f4d1756e2ba1bf52e108b Mon Sep 17 00:00:00 2001
From: Daniel Bachhuber <daniel.bachhuber@automattic.com>
Date: Fri, 3 Mar 2023 04:34:33 -0800
Subject: [PATCH 2/2] Use the parent class with `parseStability` method

---
 src/WP_CLI/CommandWithUpgrade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/WP_CLI/CommandWithUpgrade.php b/src/WP_CLI/CommandWithUpgrade.php
index 1c93e5d59..1adb6d097 100755
--- a/src/WP_CLI/CommandWithUpgrade.php
+++ b/src/WP_CLI/CommandWithUpgrade.php
@@ -2,7 +2,7 @@
 
 namespace WP_CLI;
 
-use Composer\Package\Version\VersionParser;
+use Composer\Semver\VersionParser;
 use Composer\Semver\Comparator;
 use Exception;
 use WP_CLI;