Refactor: Extract common error handling logic into set_version_check_error helper method

Copilot · swissspidy · Copilot · commit 5d8c69399d1d · 2026-01-25T15:50:50.000Z
Co-authored-by: swissspidy &lt;841956+swissspidy@users.noreply.github.com&gt;
diff --git a/src/Core_Command.php b/src/Core_Command.php
@@ -1544,22 +1544,11 @@ private function get_updates( $assoc_args ) {
 	}
 
 	/**
-	 * Handles the pre_http_request filter to capture HTTP errors during version check.
-	 *
-	 * This method signature matches the pre_http_request filter signature.
-	 * Uses PHP_INT_MAX priority to run after test mocking and plugin modifications.
+	 * Sets or clears the version check error property based on an HTTP response.
 	 *
-	 * @param false|array|WP_Error $response A preemptive return value of an HTTP request.
-	 * @param array                $args     HTTP request arguments.
-	 * @param string               $url      The request URL.
-	 * @return false|array|WP_Error The response, unmodified.
+	 * @param mixed $response The HTTP response (WP_Error, array, or other).
 	 */
-	public function capture_version_check_error( $response, $args, $url ) {
-		if ( false === strpos( $url, 'api.wordpress.org/core/version-check' ) ) {
-			return $response;
-		}
-
-		// Store the error if the response is a WP_Error
+	private function set_version_check_error( $response ) {
 		if ( is_wp_error( $response ) ) {
 			$this->version_check_error = $response;
 		} elseif ( is_array( $response ) && isset( $response['response']['code'] ) && $response['response']['code'] >= 400 ) {
@@ -1572,10 +1561,34 @@ public function capture_version_check_error( $response, $args, $url ) {
 					isset( $response['response']['message'] ) ? $response['response']['message'] : 'Unknown error'
 				)
 			);
-		} elseif ( false !== $response ) {
-			// Clear any previous error if we got a successful mocked response
+		} else {
+			// Clear any previous error if we got a successful response.
 			$this->version_check_error = null;
 		}
+	}
+
+	/**
+	 * Handles the pre_http_request filter to capture HTTP errors during version check.
+	 *
+	 * This method signature matches the pre_http_request filter signature.
+	 * Uses PHP_INT_MAX priority to run after test mocking and plugin modifications.
+	 *
+	 * @param false|array|WP_Error $response A preemptive return value of an HTTP request.
+	 * @param array                $args     HTTP request arguments.
+	 * @param string               $url      The request URL.
+	 * @return false|array|WP_Error The response, unmodified.
+	 */
+	public function capture_version_check_error( $response, $args, $url ) {
+		if ( false === strpos( $url, 'api.wordpress.org/core/version-check' ) ) {
+			return $response;
+		}
+
+		// A `false` response means the request is not being preempted.
+		// In this case, we don't want to change the error status, as the subsequent
+		// `http_api_debug` hook will handle the actual response.
+		if ( false !== $response ) {
+			$this->set_version_check_error( $response );
+		}
 
 		return $response;
 	}
@@ -1602,23 +1615,7 @@ public function capture_version_check_error_from_response( $response, $context,
 			return;
 		}
 
-		// Store the error if the response is a WP_Error
-		if ( is_wp_error( $response ) ) {
-			$this->version_check_error = $response;
-		} elseif ( is_array( $response ) && isset( $response['response']['code'] ) && $response['response']['code'] >= 400 ) {
-			// HTTP error status code (4xx or 5xx) - convert to WP_Error for consistency
-			$this->version_check_error = new \WP_Error(
-				'http_request_failed',
-				sprintf(
-					'HTTP request failed with status %d: %s',
-					$response['response']['code'],
-					isset( $response['response']['message'] ) ? $response['response']['message'] : 'Unknown error'
-				)
-			);
-		} else {
-			// Clear any previous error if we got a successful response
-			$this->version_check_error = null;
-		}
+		$this->set_version_check_error( $response );
 	}
 
 	/**
