Skip to content

Make filter callbacks private #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
swissspidy merged 1 commit into from
Mar 4, 2026
Merged

Make filter callbacks private #313

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 17 additions & 10 deletions src/Core_Command.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1613,20 +1613,27 @@ private function get_updates( $assoc_args ) {
// Reset error tracking
$this->version_check_error = null;

// Hook into pre_http_request with max priority to capture errors during version check
// This is necessary because tests and plugins may use pre_http_request to mock responses
add_filter( 'pre_http_request', [ $this, 'capture_version_check_error' ], PHP_INT_MAX, 3 );
// Using closures so that the methods can stay private and aren't accidentally exposed as commands.

// Also hook into http_api_debug to capture errors from real HTTP requests
// This fires when pre_http_request doesn't short-circuit the request
add_action( 'http_api_debug', [ $this, 'capture_version_check_error_from_response' ], 10, 5 );
$capture_version_check_error = function ( $response, $args, $url ) {
return $this->capture_version_check_error( $response, $args, $url );
};

$capture_version_check_error_from_response = function ( $response, $context, $_class, $args, $url ) {
return $this->capture_version_check_error_from_response( $response, $context, $_class, $args, $url );
};

add_filter( 'pre_http_request', $capture_version_check_error, PHP_INT_MAX, 3 );

// This fires when pre_http_request doesn't short-circuit the request.
add_action( 'http_api_debug', $capture_version_check_error_from_response, 10, 5 );

try {
wp_version_check( [], $force_check );
} finally {
// Ensure the hooks are always removed, even if wp_version_check() throws an exception
remove_filter( 'pre_http_request', [ $this, 'capture_version_check_error' ], PHP_INT_MAX );
remove_action( 'http_api_debug', [ $this, 'capture_version_check_error_from_response' ], 10 );
remove_filter( 'pre_http_request', $capture_version_check_error, PHP_INT_MAX );
remove_action( 'http_api_debug', $capture_version_check_error_from_response, 10 );
}

/**
Expand Down Expand Up @@ -1727,7 +1734,7 @@ private function set_version_check_error( $response ) {
*
* @phpstan-param HTTP_Response|WP_Error|false $response
*/
public function capture_version_check_error( $response, $args, $url ) {
private function capture_version_check_error( $response, $args, $url ) {
if ( false === strpos( $url, 'api.wordpress.org/core/version-check' ) ) {
return $response;
}
Expand Down Expand Up @@ -1756,7 +1763,7 @@ public function capture_version_check_error( $response, $args, $url ) {
*
* @phpstan-param HTTP_Response|WP_Error $response
*/
public function capture_version_check_error_from_response( $response, $context, $_class, $_args, $url ) {
private function capture_version_check_error_from_response( $response, $context, $_class, $_args, $url ) {
if ( false === strpos( $url, 'api.wordpress.org/core/version-check' ) ) {
return;
}
Expand Down