lots of phpcs cleanups

Author: dsmith4-godaddy

src/wp-admin/includes/class-wp-debug-data.php

@@ -298,7 +298,7 @@ private static function get_wp_core(): array {
 		$fields['update_api_base'] = array(
 			'label' => 'Update API URL',
 			'value' => $update_api_base,
-			'debug' => true
+			'debug' => true,
 		);
 
 		$update_dom = parse_url( wp_get_update_api_base(), PHP_URL_HOST );
@@ -316,7 +316,7 @@ private static function get_wp_core(): array {
 					'label' => __( 'Communication with update API' ),
 					'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' ),
+						__( 'Unable to reach %1$s (%2$s): %3$s' ),
 						$update_dom;
 						gethostbyname( $update_dom ),
 						$wp_update_api->get_error_message(),

src/wp-admin/includes/class-wp-site-health.php

@@ -1391,7 +1391,7 @@ public function get_test_alt_update_api_communication() {
 					__( 'Error' ),
 					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' ),
+						__( 'Your site is unable to reach the specified update API endpoint (%1$s) at %2$s, and returned the error: %3$s' ),
 						wp_get_api_request_url(),
 						gethostbyname( parse_url( wp_get_api_request_url(), PHP_URL_HOST ) ),
 						$wp_update_api->get_error_message()
@@ -1401,7 +1401,7 @@ public function get_test_alt_update_api_communication() {
 
 			$result['actions'] = sprintf(
 				/* translators: URL of update API */
-				__('Contact the owners of %s for support.'),
+				__( 'Contact the owners of %s for support.' ),
 				wp_get_api_request_url()
 			);
 		}

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_api_request_url( '/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 ) . "' );";

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_api_request_url( '/translations/' . $type . '/1.0/' , 'http' );
+		$url      = wp_get_api_request_url( '/translations/' . $type . '/1.0/', 'http' );
 		$http_url = $url;
 		$ssl      = wp_http_supports( array( 'ssl' ) );
 		if ( $ssl ) {

src/wp-includes/functions.php

@@ -9224,20 +9224,21 @@ function wp_verify_fast_hash(
 
 /**
  * Given a path, returns the complete URL for a WP API request.
- * 
+ *
  * @since 7.0.0
- * 
+ *
  * @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_api_request_url( $path = '/', $scheme = 'https' ) {
 	$domain = WP_UPDATE_API_DEFAULT;
-	if (false !== getenv('WP_UPDATE_API_BASE')) {
-		$domain = getenv('WP_UPDATE_API_BASE');
+	if (false !== getenv( 'WP_UPDATE_API_BASE' ) ) {
+		$domain = getenv( 'WP_UPDATE_API_BASE' );
 	}
 
-	$uri = $scheme . "://" . $domain . $path ;
+	$uri = $scheme . '://' . $domain . $path;
 	/**
 	 * Filters the URL for a WP API request.
 	 * 
@@ -9246,5 +9247,5 @@ function wp_get_api_request_url( $path = '/', $scheme = 'https' ) {
 	 * @param string $url URL
 	 */
 	$uri = apply_filters( 'wp_api_request');
-    return $uri;
+	return $uri;
 }

src/wp-includes/rest-api/endpoints/class-wp-rest-pattern-directory-controller.php

@@ -114,7 +114,7 @@ public function get_items( $request ) {
 		$raw_patterns = get_site_transient( $transient_key );
 
 		if ( ! $raw_patterns ) {
-			$api_url = wp_get_update_api_base( $https = false ) . '/patterns/1.0/?' . build_query( $query_args );
+                        $api_url = wp_get_api_request_url( '/patterns/1.0/?' . build_query( $query_args ) , 'http' );
 			if ( wp_http_supports( array( 'ssl' ) ) ) {
 				$api_url = set_url_scheme( $api_url, 'https' );
 			}

src/wp-includes/rest-api/endpoints/class-wp-rest-site-health-controller.php

@@ -135,7 +135,7 @@ public function register_routes() {
 				array(
 					'methods'             => 'GET',
 					'callback'            => array( $this, 'test_alt_update_api_communication' ),
-					'permission_callback' => function() {
+					'permission_callback' => function () {
 						return $this->validate_request_permission( 'alt_update_api_communication' );
 					},
 				),

src/wp-includes/update.php

@@ -188,7 +188,7 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) {
 		$query['channel'] = WP_AUTO_UPDATE_CORE;
 	}
 
-	$url      = wp_get_update_api_base( $https = false ). '/core/version-check/1.7/?' . http_build_query( $query, '', '&' );
+	$url      = wp_get_api_request_url( '/core/version-check/1.7/?' . http_build_query( $query, '', '&' ), 'http' );
 	$http_url = $url;
 	$ssl      = wp_http_supports( array( 'ssl' ) );
 
@@ -425,7 +425,7 @@ function wp_update_plugins( $extra_stats = array() ) {
 		$options['body']['update_stats'] = wp_json_encode( $extra_stats );
 	}
 
-	$url      = wp_get_update_api_base( $https = false ). '/plugins/update-check/1.1/';
+	$url      = wp_get_api_request_url( '/plugins/update-check/1.1/', 'http' );
 	$http_url = $url;
 	$ssl      = wp_http_supports( array( 'ssl' ) );
 
@@ -710,7 +710,7 @@ function wp_update_themes( $extra_stats = array() ) {
 		$options['body']['update_stats'] = wp_json_encode( $extra_stats );
 	}
 
-	$url      = wp_get_update_api_base( $https = false ) . '/themes/update-check/1.1/';
+	$url      = wp_get_api_request_url( '/themes/update-check/1.1/', 'http' );
 	$http_url = $url;
 	$ssl      = wp_http_supports( array( 'ssl' ) );