Skip to content

Commit 2db8868

Browse files
authored
Merge pull request #237 from wp-cli/try/wporg-api
Use existing `WpOrgApi` helper class
2 parents 083a54e + 494388b commit 2db8868

File tree

1 file changed

+18
-19
lines changed

1 file changed

+18
-19
lines changed

src/Context/FeatureContext.php

+18-19
Original file line numberDiff line numberDiff line change
@@ -714,25 +714,24 @@ private function replace_wp_versions( $str ) {
714714
if ( null === $wp_versions ) {
715715
$wp_versions = [];
716716

717-
$response = Utils\http_request( 'GET', 'https://api.wordpress.org/core/version-check/1.7/', null, [], [ 'timeout' => 30 ] );
718-
if ( 200 === $response->status_code ) {
719-
$body = json_decode( $response->body );
720-
if ( is_object( $body ) && isset( $body->offers ) && is_array( $body->offers ) ) {
721-
// Latest version alias.
722-
$wp_versions['{WP_VERSION-latest}'] = count( $body->offers ) ? $body->offers[0]->version : '';
723-
foreach ( $body->offers as $offer ) {
724-
$sub_ver = preg_replace( '/(^[0-9]+\.[0-9]+)\.[0-9]+$/', '$1', $offer->version );
725-
$sub_ver_key = "{WP_VERSION-{$sub_ver}-latest}";
726-
727-
$main_ver = preg_replace( '/(^[0-9]+)\.[0-9]+$/', '$1', $sub_ver );
728-
$main_ver_key = "{WP_VERSION-{$main_ver}-latest}";
729-
730-
if ( ! isset( $wp_versions[ $main_ver_key ] ) ) {
731-
$wp_versions[ $main_ver_key ] = $offer->version;
732-
}
733-
if ( ! isset( $wp_versions[ $sub_ver_key ] ) ) {
734-
$wp_versions[ $sub_ver_key ] = $offer->version;
735-
}
717+
$wp_org_api = new WpOrgApi();
718+
$result = $wp_org_api->get_core_version_check();
719+
720+
if ( is_array( $result ) && ! empty( $result['offers'] ) ) {
721+
// Latest version alias.
722+
$wp_versions['{WP_VERSION-latest}'] = count( $result['offers'] ) ? $result['offers'][0]['version'] : '';
723+
foreach ( $result['offers'] as $offer ) {
724+
$sub_ver = preg_replace( '/(^[0-9]+\.[0-9]+)\.[0-9]+$/', '$1', $offer['version'] );
725+
$sub_ver_key = "{WP_VERSION-{$sub_ver}-latest}";
726+
727+
$main_ver = preg_replace( '/(^[0-9]+)\.[0-9]+$/', '$1', $sub_ver );
728+
$main_ver_key = "{WP_VERSION-{$main_ver}-latest}";
729+
730+
if ( ! isset( $wp_versions[ $main_ver_key ] ) ) {
731+
$wp_versions[ $main_ver_key ] = $offer['version'];
732+
}
733+
if ( ! isset( $wp_versions[ $sub_ver_key ] ) ) {
734+
$wp_versions[ $sub_ver_key ] = $offer['version'];
736735
}
737736
}
738737
}

0 commit comments

Comments
 (0)