Skip to content

Ensure a stable version is used when --minor or --patch specified #355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danielbachhuber merged 2 commits into from
Mar 3, 2023
Merged

Ensure a stable version is used when --minor or --patch specified #355

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c5a9e6
Ensure a stable version is used when `--minor` or `--patch` specified
danielbachhuber Mar 2, 2023
ec595c9
Use the parent class with `parseStability` method
danielbachhuber Mar 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/WP_CLI/CommandWithUpgrade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace WP_CLI;

use Composer\Semver\VersionParser;
use Composer\Semver\Comparator;
use Exception;
use WP_CLI;
Expand Down Expand Up @@ -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' );
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
}
Expand Down