diff -r c7c34916027a -r 177826044cd9 wp/wp-includes/class-wp-http-ixr-client.php --- a/wp/wp-includes/class-wp-http-ixr-client.php Mon Oct 14 18:06:33 2019 +0200 +++ b/wp/wp-includes/class-wp-http-ixr-client.php Mon Oct 14 18:28:13 2019 +0200 @@ -4,7 +4,6 @@ * * @package WordPress * @since 3.1.0 - * */ class WP_HTTP_IXR_Client extends IXR_Client { public $scheme; @@ -19,14 +18,14 @@ * @param int|bool $port * @param int $timeout */ - public function __construct($server, $path = false, $port = false, $timeout = 15) { + public function __construct( $server, $path = false, $port = false, $timeout = 15 ) { if ( ! $path ) { // Assume we have been given a URL instead - $bits = parse_url($server); + $bits = parse_url( $server ); $this->scheme = $bits['scheme']; $this->server = $bits['host']; - $this->port = isset($bits['port']) ? $bits['port'] : $port; - $this->path = !empty($bits['path']) ? $bits['path'] : '/'; + $this->port = isset( $bits['port'] ) ? $bits['port'] : $port; + $this->path = ! empty( $bits['path'] ) ? $bits['path'] : '/'; // Make absolutely sure we have a path if ( ! $this->path ) { @@ -39,33 +38,33 @@ } else { $this->scheme = 'http'; $this->server = $server; - $this->path = $path; - $this->port = $port; + $this->path = $path; + $this->port = $port; } $this->useragent = 'The Incutio XML-RPC PHP Library'; - $this->timeout = $timeout; + $this->timeout = $timeout; } /** * @return bool */ public function query() { - $args = func_get_args(); - $method = array_shift($args); - $request = new IXR_Request($method, $args); - $xml = $request->getXml(); + $args = func_get_args(); + $method = array_shift( $args ); + $request = new IXR_Request( $method, $args ); + $xml = $request->getXml(); $port = $this->port ? ":$this->port" : ''; - $url = $this->scheme . '://' . $this->server . $port . $this->path; + $url = $this->scheme . '://' . $this->server . $port . $this->path; $args = array( - 'headers' => array('Content-Type' => 'text/xml'), + 'headers' => array( 'Content-Type' => 'text/xml' ), 'user-agent' => $this->useragent, 'body' => $xml, ); // Merge Custom headers ala #8145 foreach ( $this->headers as $header => $value ) { - $args['headers'][$header] = $value; + $args['headers'][ $header ] = $value; } /** @@ -73,7 +72,7 @@ * * @since 4.4.0 * - * @param array $headers Array of headers to be sent. + * @param string[] $headers Associative array of headers to be sent. */ $args['headers'] = apply_filters( 'wp_http_ixr_client_headers', $args['headers'] ); @@ -83,20 +82,20 @@ // Now send the request if ( $this->debug ) { - echo '
' . htmlspecialchars($xml) . "\n\n\n"; + echo '
' . htmlspecialchars( $xml ) . "\n\n\n"; } - $response = wp_remote_post($url, $args); + $response = wp_remote_post( $url, $args ); - if ( is_wp_error($response) ) { - $errno = $response->get_error_code(); - $errorstr = $response->get_error_message(); - $this->error = new IXR_Error(-32300, "transport error: $errno $errorstr"); + if ( is_wp_error( $response ) ) { + $errno = $response->get_error_code(); + $errorstr = $response->get_error_message(); + $this->error = new IXR_Error( -32300, "transport error: $errno $errorstr" ); return false; } if ( 200 != wp_remote_retrieve_response_code( $response ) ) { - $this->error = new IXR_Error(-32301, 'transport error - HTTP status code was not 200 (' . wp_remote_retrieve_response_code( $response ) . ')'); + $this->error = new IXR_Error( -32301, 'transport error - HTTP status code was not 200 (' . wp_remote_retrieve_response_code( $response ) . ')' ); return false; } @@ -108,13 +107,13 @@ $this->message = new IXR_Message( wp_remote_retrieve_body( $response ) ); if ( ! $this->message->parse() ) { // XML error - $this->error = new IXR_Error(-32700, 'parse error. not well formed'); + $this->error = new IXR_Error( -32700, 'parse error. not well formed' ); return false; } // Is the message a fault? if ( $this->message->messageType == 'fault' ) { - $this->error = new IXR_Error($this->message->faultCode, $this->message->faultString); + $this->error = new IXR_Error( $this->message->faultCode, $this->message->faultString ); return false; }