Refactor all the things (first untested draft)

dsmith4-godaddy · dsmith4-godaddy · commit a9f4f33ccd23 · 2025-10-20T15:30:37.000-05:00
diff --git a/src/wp-admin/includes/class-wp-community-events.php b/src/wp-admin/includes/class-wp-community-events.php
@@ -98,7 +98,7 @@ public function get_events( $location_search = '', $timezone = '' ) {
 		// Include an unmodified $wp_version.
 		require ABSPATH . WPINC . '/version.php';
 
-		$api_url                    = WP_UPDATE_API_DEFAULT . '/events/1.0/';
+		$api_url                    = wp_get_api_request_url( '/events/1.0/' );
 		$request_args               = $this->get_request_args( $location_search, $timezone );
 		$request_args['user-agent'] = 'WordPress/' . $wp_version . '; ' . home_url( '/' );
 
diff --git a/src/wp-admin/includes/class-wp-debug-data.php b/src/wp-admin/includes/class-wp-debug-data.php
@@ -155,7 +155,7 @@ private static function get_wp_core(): array {
 		$core_version           = wp_get_wp_version();
 		$core_updates           = get_core_updates();
 		$core_update_needed     = '';
-		$update_api_base        = wp_get_update_api_base();
+		$update_api_base        = wp_get_api_request_url();
 
 		if ( is_array( $core_updates ) ) {
 			foreach ( $core_updates as $core => $update ) {
@@ -301,7 +301,8 @@ private static function get_wp_core(): array {
 			'debug' => true
 		);
 
-		if ( WP_UPDATE_API_DEFAULT !== wp_get_update_api_base()) {
+		$update_dom = parse_url( wp_get_update_api_base(), PHP_URL_HOST );
+		if ( WP_UPDATE_API_DEFAULT !== $update_dom ) {
 			$wp_update_api = wp_remote_get( wp_get_update_api_base(), array( 'timeout' => 10 ) );
 
 			if ( ! is_wp_error( $wp_update_api ) ) {
@@ -316,8 +317,8 @@ private static function get_wp_core(): array {
 					'value' => sprintf(
 						/* Translators: 1: hostname of update API, 2: IP address the update API hostname resolves to. 3: The error returned by the lookup */
 						__('Unable to reach %1$s (%2$s): %3$s' ),
-						parse_url( $update_api_base, PHP_URL_HOST ),
-						gethostbyname( parse_url( $update_api_base, PHP_URL_HOST ) ),
+						$update_dom;
+						gethostbyname( $update_dom ),
 						$wp_update_api->get_error_message(),
 					),
 					'debug' => $wp_update_api->get_error_message(),
diff --git a/src/wp-admin/includes/class-wp-site-health.php b/src/wp-admin/includes/class-wp-site-health.php
@@ -1307,7 +1307,7 @@ public function get_test_dotorg_communication() {
 		);
 
 		$wp_dotorg = wp_remote_get(
-			WP_UPDATE_API_DEFAULT,
+			'http://' . WP_UPDATE_API_DEFAULT . '/',
 			array(
 				'timeout' => 10,
 			)
@@ -1350,7 +1350,7 @@ public function get_test_dotorg_communication() {
 	/**
 	 * Tests if the site can communicate with a non-default update API endpoint.
 	 *
-	 * @since 6.9.0
+	 * @since 7.0.0
 	 *
 	 * @return array The test results.
 	 */
@@ -1371,7 +1371,7 @@ public function get_test_alt_update_api_communication() {
 		);
 
 		$wp_update_api = wp_remote_get(
-			wp_get_update_api_base(),
+			wp_get_api_request_url(),
 			array(
 				'timeout' => 10,
 			)
@@ -1392,8 +1392,8 @@ public function get_test_alt_update_api_communication() {
 					sprintf(
 						/* translators: 1: update API URL. 2: The IP address the update API endpoint resolves to. 3: The error returned by the lookup. */
 						__( 'Your site is unable to reach the specified update API endpoint (%s) at %s, and returned the error: %s' ),
-						wp_get_update_api_base(),
-						gethostbyname( parse_url( wp_get_update_api_base(), PHP_URL_HOST ) ),
+						wp_get_api_request_url(),
+						gethostbyname( parse_url( wp_get_api_request_url(), PHP_URL_HOST ) ),
 						$wp_update_api->get_error_message()
 					)
 				)
@@ -1402,7 +1402,7 @@ public function get_test_alt_update_api_communication() {
 			$result['actions'] = sprintf(
 				/* translators: URL of update API */
 				__('Contact the owners of %s for support.'),
-				wp_get_update_api_base()
+				wp_get_api_request_url()
 			);
 		}
 
@@ -2929,7 +2929,7 @@ public static function get_tests() {
 		}
 
 		// Only check alternate update API endpoint if one has been configured.
-		if ( WP_UPDATE_API_DEFAULT !== wp_get_update_api_base() ) {
+		if ( WP_UPDATE_API_DEFAULT !== parse_url( wp_get_api_request_url(), PHP_URL_HOST ) ) {
 			$tests['async']['alt_update_api_communication'] = array(
 				'label'             => __( 'Communication with update API' ),
 				'test'              => rest_url( 'wp-site-health/v1/tests/alt-update-api-communication' ),
diff --git a/src/wp-admin/includes/credits.php b/src/wp-admin/includes/credits.php
@@ -32,7 +32,7 @@ function wp_credits( $version = '', $locale = '' ) {
 		|| str_contains( $version, '-' )
 		|| ( isset( $results['data']['version'] ) && ! str_starts_with( $version, $results['data']['version'] ) )
 	) {
-		$url     = WP_UPDATE_API_DEFAULT . "/core/credits/1.1/?version={$version}&locale={$locale}";
+		$url     = wp_get_api_request_url( "/core/credits/1.1/?version={$version}&locale={$locale}" );
 		$options = array( 'user-agent' => 'WordPress/' . $version . '; ' . home_url( '/' ) );
 
 		if ( wp_http_supports( array( 'ssl' ) ) ) {
diff --git a/src/wp-admin/includes/dashboard.php b/src/wp-admin/includes/dashboard.php
@@ -1814,7 +1814,7 @@ function wp_check_browser_version() {
 	$response = get_site_transient( 'browser_' . $key );
 
 	if ( false === $response ) {
-		$url     = wp_get_update_api_base( $https = false ) . '/core/browse-happy/1.1/';
+		$url     = wp_get_api_request_url( '/core/browse-happy/1.1/', 'http' );
 		$options = array(
 			'body'       => array( 'useragent' => $_SERVER['HTTP_USER_AGENT'] ),
 			'user-agent' => 'WordPress/' . wp_get_wp_version() . '; ' . home_url( '/' ),
diff --git a/src/wp-admin/includes/import.php b/src/wp-admin/includes/import.php
@@ -146,7 +146,7 @@ function wp_get_popular_importers() {
 				'locale'  => $locale,
 				'version' => wp_get_wp_version(),
 			),
-			wp_get_update_api_base( $https = false ) . '/core/importers/1.1/'
+			wp_get_api_request_url( '/core/importers/1.1/', 'http' )
 		);
 		$options = array( 'user-agent' => 'WordPress/' . wp_get_wp_version() . '; ' . home_url( '/' ) );
 
diff --git a/src/wp-admin/includes/misc.php b/src/wp-admin/includes/misc.php
@@ -1579,7 +1579,7 @@ function wp_check_php_version() {
 	$response = get_site_transient( 'php_check_' . $key );
 
 	if ( false === $response ) {
-		$url = wp_get_update_api_base( $https = false ) . '/core/serve-happy/1.0/';
+		$url = wp_get_api_request_url( '/core/serve-happy/1.0/', 'http' );
 
 		if ( wp_http_supports( array( 'ssl' ) ) ) {
 			$url = set_url_scheme( $url, 'https' );
diff --git a/src/wp-admin/includes/network.php b/src/wp-admin/includes/network.php
@@ -554,7 +554,7 @@ function network_step2( $errors = false ) {
 
 		if ( ! empty( $keys_salts ) ) {
 			$keys_salts_str = '';
-			$from_api       = wp_remote_get( wp_get_update_api_base() . '/secret-key/1.1/salt/' );
+			$from_api       = wp_remote_get( wp_get_api_request_url( '/secret-key/1.1/salt/') );
 			if ( is_wp_error( $from_api ) ) {
 				foreach ( $keys_salts as $c => $v ) {
 					$keys_salts_str .= "\ndefine( '$c', '" . wp_generate_password( 64, true, true ) . "' );";
diff --git a/src/wp-admin/includes/plugin-install.php b/src/wp-admin/includes/plugin-install.php
@@ -146,7 +146,7 @@ function plugins_api( $action, $args = array() ) {
 
 	if ( false === $res ) {
 
-		$url = wp_get_update_api_base( $https = false ) . '/plugins/info/1.2/';
+		$url = wp_get_api_request_url( '/plugins/info/1.2/' );
 		$url = add_query_arg(
 			array(
 				'action'  => $action,
diff --git a/src/wp-admin/includes/theme.php b/src/wp-admin/includes/theme.php
@@ -542,7 +542,7 @@ function themes_api( $action, $args = array() ) {
 	$res = apply_filters( 'themes_api', false, $action, $args );
 
 	if ( ! $res ) {
-		$url = wp_get_update_api_base( $https = false ) . '/themes/info/1.2/';
+		$url = wp_get_api_request_url( '/themes/info/1.2/', 'http' );
 		$url = add_query_arg(
 			array(
 				'action'  => $action,
diff --git a/src/wp-admin/includes/translation-install.php b/src/wp-admin/includes/translation-install.php
@@ -50,7 +50,7 @@ function translations_api( $type, $args = null ) {
 	$res = apply_filters( 'translations_api', false, $type, $args );
 
 	if ( false === $res ) {
-		$url      = wp_get_update_api_base( $https = false ) . '/translations/' . $type . '/1.0/';
+		$url      = wp_get_api_request_url( '/translations/' . $type . '/1.0/' , 'http' );
 		$http_url = $url;
 		$ssl      = wp_http_supports( array( 'ssl' ) );
 		if ( $ssl ) {
diff --git a/src/wp-admin/includes/update.php b/src/wp-admin/includes/update.php
@@ -129,7 +129,8 @@ function find_core_auto_update() {
  * @return array|false An array of checksums on success, false on failure.
  */
 function get_core_checksums( $version, $locale ) {
-	$http_url = wp_get_update_api_base( $https = false ) . '/core/checksums/1.0/?' . http_build_query( compact( 'version', 'locale' ), '', '&' );
+	$path = '/core/checksums/1.0/?' . http_build_query( compact( 'version', 'locale' ), '', '&' );
+	$http_url = wp_get_api_request_url( $path, 'http' );
 	$url      = $http_url;
 
 	$ssl = wp_http_supports( array( 'ssl' ) );
diff --git a/src/wp-admin/setup-config.php b/src/wp-admin/setup-config.php
@@ -358,7 +358,7 @@ function setup_config_display_header( $body_classes = array() ) {
 			$no_api = isset( $_POST['noapi'] );
 
 			if ( ! $no_api ) {
-				$secret_keys = wp_remote_get( wp_get_update_api_base() . '/secret-key/1.1/salt/' );
+				$secret_keys = wp_remote_get( wp_get_api_request_url( '/secret-key/1.1/salt/' ) );
 			}
 
 			if ( $no_api || is_wp_error( $secret_keys ) ) {
diff --git a/src/wp-includes/default-constants.php b/src/wp-includes/default-constants.php
@@ -142,8 +142,8 @@ function wp_initial_constants() {
 	// Constants for features added to WP that should short-circuit their plugin implementations.
 	define( 'WP_FEATURE_BETTER_PASSWORDS', true );
 
-	// Defines the default URL base for many update-related functions
-	define( 'WP_UPDATE_API_DEFAULT', 'http://api.wordpress.org' );
+	// Defines the default URL host for many update-related functions
+	define( 'WP_UPDATE_API_DEFAULT', 'api.wordpress.org' );
 
 	/**#@+
 	 * Constants for expressing human-readable intervals
diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php
@@ -9223,37 +9223,28 @@ function wp_verify_fast_hash(
 }
 
 /**
- * Returns the base URL in use for the wordpress.org API. Defaults to http://api.wordpress.org .
- * 
- * This URL can be overridden by specifying an environment variable `WP_UPDATE_API_BASE` or
- * by using the {@see wp_update_api_base} filter. Providing an empty URL is not allowed and
- * will result in the default being used.
+ * Given a path, returns the complete URL for a WP API request.
  * 
  * @since 7.0.0
  * 
- * @param bool $https Whether requests should use https instead of http, defaults to true.
- * @return string The base URL in use for the wordpress.org update API.
+ * @param string $path     The API endpoint to request.
+ * @param string $scheme   Optional. Scheme for request. Defaults to https.
+ * @return string          Complete URL for this request.
  */
-function wp_get_update_api_base( $https = true ) {
-	$api_base = WP_UPDATE_API_DEFAULT;
-
-	if ( false !== getenv('WP_UPDATE_API_BASE') ) {
-		$api_base = getenv('WP_UPDATE_API_BASE');
+function wp_get_api_request_url( $path = '/', $scheme = 'https' ) {
+	$domain = WP_UPDATE_API_DEFAULT;
+	if (false !== getenv('WP_UPDATE_API_BASE')) {
+		$domain = getenv('WP_UPDATE_API_BASE');
 	}
 
+	$uri = $scheme . "://" . $domain . $path ;
 	/**
-	 * Filters the base URL used for wordpress.org API requests.
-	 *
+	 * Filters the URL for a WP API request.
+	 * 
 	 * @since 7.0.0
-	 *
-	 * @param string $content Default text.
+	 * 
+	 * @param string $url URL
 	 */
-	$api_base = apply_filters( 'wp_update_api_base', $api_base );
-
-	// required for back-compat as many old api references in core use http:// explicitly
-	if ( (! $https) && (substr($api_base, 0, 7) == 'http://') && ($api_base === WP_UPDATE_API_DEFAULT)) {
-		$api_base = str_replace( $api_base, 'http://', 'https://' );
-	}
-
-	return $api_base;
-}
+	$uri = apply_filters( 'wp_api_request');
+    return $uri;
+}
