Use existing WpOrgApi helper class

Author: swissspidy

src/Core_Command.php

@@ -1004,42 +1004,6 @@ private static function find_var( $var_name, $code ) {
 		return trim( $value, " '" );
 	}
 
-	/**
-	 * Security copy of the core function with Requests - Gets the checksums for the given version of WordPress.
-	 *
-	 * @param string $version  Version string to query.
-	 * @param string $locale   Locale to query.
-	 * @param bool   $insecure Whether to retry without certificate validation on TLS handshake failure.
-	 * @return string|array String message on failure. An array of checksums on success.
-	 */
-	private static function get_core_checksums( $version, $locale, $insecure ) {
-		$query = http_build_query( compact( 'version', 'locale' ), '', '&' );
-		$url   = "https://api.wordpress.org/core/checksums/1.0/?{$query}";
-
-		$headers = [ 'Accept' => 'application/json' ];
-		$options = [
-			'timeout'  => 30,
-			'insecure' => $insecure,
-		];
-
-		$response = Utils\http_request( 'GET', $url, null, $headers, $options );
-
-		if ( ! $response->success || 200 !== (int) $response->status_code ) {
-			return "Checksum request '{$url}' failed (HTTP {$response->status_code}).";
-		}
-
-		$body = trim( $response->body );
-		$body = json_decode( $body, true );
-
-		if ( ! is_array( $body )
-			|| ! isset( $body['checksums'] )
-			|| ! is_array( $body['checksums'] ) ) {
-			return "Checksums not available for WordPress {$version}/{$locale}.";
-		}
-
-		return $body['checksums'];
-	}
-
 	/**
 	 * Updates WordPress to a newer version.
 	 *
@@ -1432,14 +1396,19 @@ private function cleanup_extra_files( $version_from, $version_to, $locale, $inse
 			return;
 		}
 
-		$old_checksums = self::get_core_checksums( $version_from, $locale ?: 'en_US', $insecure );
-		if ( ! is_array( $old_checksums ) ) {
-			WP_CLI::warning( "{$old_checksums} Please cleanup files manually." );
+		$wp_org_api = new WpOrgApi( [ 'insecure' => $insecure ] );
+
+		try {
+			$old_checksums = $wp_org_api->get_core_checksums( $version_from, $locale );
+		} catch ( Exception $exception ) {
+			WP_CLI::warning( "{$exception->getMessage()} Please cleanup files manually." );
 			return;
 		}
-		$new_checksums = self::get_core_checksums( $version_to, $locale ?: 'en_US', $insecure );
-		if ( ! is_array( $new_checksums ) ) {
-			WP_CLI::warning( "{$new_checksums} Please cleanup files manually." );
+
+		try {
+			$new_checksums = $wp_org_api->get_core_checksums( $version_to, $locale );
+		} catch ( Exception $exception ) {
+			WP_CLI::warning( "{$exception->getMessage()} Please cleanup files manually." );
 			return;
 		}