vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-11 20:30:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

HTTP API: Switch back to returning an array.

Browse Source 
The array-compatibility object we started returning in r37428 unfortunately isn't enough like an array. In particular, `is_array()` checks fail, despite the object implementing ArrayAccess. Mea culpa.

This moves the WP_HTTP_Response object to a new http_response key in the array, and changes the value back to an actual array.

Fixes #37097.
See #33055.


git-svn-id: https://develop.svn.wordpress.org/trunk@37989 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan McCue
2016-07-06 17:50:44 +00:00
parent 3edf3be241
commit 194c8d0e33
3 changed files with 31 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wp-includes/class-wp-http-requests-response.php
+15 -83
View File
@@ -1,13 +1,13 @@
<?php
/**
* Wrapper object for a Requests_Response for compatibility.
* Wrapper object for a Requests_Response for standardisation.
*
* @package WordPress
* @subpackage HTTP
* @since 4.6.0
*/
class WP_HTTP_Requests_Response extends WP_HTTP_Response implements ArrayAccess {
class WP_HTTP_Requests_Response extends WP_HTTP_Response {
/**
* Requests Response object.
*
@@ -142,88 +142,20 @@ class WP_HTTP_Requests_Response extends WP_HTTP_Response implements ArrayAccess
}
/**
* Check if an ArrayAccess offset exists.
* Convert the object to a WP_Http response array.
*
* This is for array access back-compat.
*
* @param string|int $key Array offset.
* @return bool True if the offset exists, false otherwise.
* @return array WP_Http response array, per WP_Http::request().
*/
public function offsetExists( $key ) {
$allowed = array( 'headers', 'body', 'response', 'cookies', 'filename' );
return in_array( $key, $allowed );
}
/**
* Get an ArrayAccess value.
*
* This is for array access back-compat.
*
* @param string|int $key Array offset to get.
* @return mixed Value if the key is a valid offset, null if invalid.
*/
public function offsetGet( $key ) {
switch ( $key ) {
case 'headers':
return $this->get_headers();
case 'body':
return $this->get_data();
case 'response':
return array(
'code' => $this->get_status(),
'message' => get_status_header_desc( $this->get_status() ),
);
case 'cookies':
return $this->get_cookies();
case 'filename':
return $this->filename;
}
return null;
}
/**
* Set an ArrayAccess value.
*
* This is for array access back-compat.
*
* @param string|int $key Array offset to set.
* @param mixed $value Value to set.
*/
public function offsetSet( $key, $value ) {
switch ( $key ) {
case 'headers':
$this->set_headers( $value );
break;
case 'body':
$this->set_data( $value );
break;
case 'response':
if ( isset( $value['code'] ) ) {
$this->set_status( $value['code'] );
}
break;
case 'filename':
$this->filename = $value;
break;
}
}
/**
* Unset an ArrayAccess value.
*
* This is for array access back-compat.
*
* @param string|int $key Array offset to remove.
*/
public function offsetUnset( $key ) {
$this->offsetSet( $key, null );
public function to_array() {
return array(
'headers' => $this->get_headers(),
'body' => $this->get_data(),
'response' => array(
'code' => $this->get_status(),
'message' => get_status_header_desc( $this->get_status() ),
),
'cookies' => $this->get_cookies(),
'filename' => $this->filename,
);
}
}