Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-24 21:32:51 +02:00
Code Issues Projects Releases Wiki Activity

Add access modifier to methods of HTTP classes. There are no new private or protected methods, so no need for __call().

Browse Source 
See #27881, #22234.

Built from https://develop.svn.wordpress.org/trunk@28506


git-svn-id: http://core.svn.wordpress.org/trunk@28332 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2014-05-19 05:34:15 +00:00
parent 35fb2e48e0
commit d6e5fcab4d
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
wp-includes/class-http.php
View File

@ -64,7 +64,7 @@ class WP_Http {
* @param str|array $args Optional. Override the defaults. * @param str|array $args Optional. Override the defaults.
* @return array|object Array containing 'headers', 'body', 'response', 'cookies', 'filename'. A WP_Error instance upon error * @return array|object Array containing 'headers', 'body', 'response', 'cookies', 'filename'. A WP_Error instance upon error
*/ */
function request( $url, $args = array() ) { public function request( $url, $args = array() ) {
global $wp_version; global $wp_version;
$defaults = array( $defaults = array(
@ -372,7 +372,7 @@ class WP_Http {
* @param string|array $args Optional. Override the defaults. * @param string|array $args Optional. Override the defaults.
* @return array|object Array containing 'headers', 'body', 'response', 'cookies', 'filename'. A WP_Error instance upon error * @return array|object Array containing 'headers', 'body', 'response', 'cookies', 'filename'. A WP_Error instance upon error
*/ */
function post($url, $args = array()) { public function post($url, $args = array()) {
$defaults = array('method' => 'POST'); $defaults = array('method' => 'POST');
$r = wp_parse_args( $args, $defaults ); $r = wp_parse_args( $args, $defaults );
return $this->request($url, $r); return $this->request($url, $r);
@ -390,7 +390,7 @@ class WP_Http {
* @param str|array $args Optional. Override the defaults. * @param str|array $args Optional. Override the defaults.
* @return array|object Array containing 'headers', 'body', 'response', 'cookies', 'filename'. A WP_Error instance upon error * @return array|object Array containing 'headers', 'body', 'response', 'cookies', 'filename'. A WP_Error instance upon error
*/ */
function get($url, $args = array()) { public function get($url, $args = array()) {
$defaults = array('method' => 'GET'); $defaults = array('method' => 'GET');
$r = wp_parse_args( $args, $defaults ); $r = wp_parse_args( $args, $defaults );
return $this->request($url, $r); return $this->request($url, $r);
@ -408,7 +408,7 @@ class WP_Http {
* @param str|array $args Optional. Override the defaults. * @param str|array $args Optional. Override the defaults.
* @return array|object Array containing 'headers', 'body', 'response', 'cookies', 'filename'. A WP_Error instance upon error * @return array|object Array containing 'headers', 'body', 'response', 'cookies', 'filename'. A WP_Error instance upon error
*/ */
function head($url, $args = array()) { public function head($url, $args = array()) {
$defaults = array('method' => 'HEAD'); $defaults = array('method' => 'HEAD');
$r = wp_parse_args( $args, $defaults ); $r = wp_parse_args( $args, $defaults );
return $this->request($url, $r); return $this->request($url, $r);
@ -591,7 +591,7 @@ class WP_Http {
* @param string $uri URI of url. * @param string $uri URI of url.
* @return bool True to block, false to allow. * @return bool True to block, false to allow.
*/ */
function block_request($uri) { public function block_request($uri) {
// We don't need to block requests, because nothing is blocked. // We don't need to block requests, because nothing is blocked.
if ( ! defined( 'WP_HTTP_BLOCK_EXTERNAL' ) || ! WP_HTTP_BLOCK_EXTERNAL ) if ( ! defined( 'WP_HTTP_BLOCK_EXTERNAL' ) || ! WP_HTTP_BLOCK_EXTERNAL )
return false; return false;
@ -638,7 +638,7 @@ class WP_Http {
} }
static function make_absolute_url( $maybe_relative_path, $url ) { public static function make_absolute_url( $maybe_relative_path, $url ) {
if ( empty( $url ) ) if ( empty( $url ) )
return $maybe_relative_path; return $maybe_relative_path;
@ -697,7 +697,7 @@ class WP_Http {
* @param array $response The Response of the HTTP request. * @param array $response The Response of the HTTP request.
* @return false|object False if no redirect is present, a WP_HTTP or WP_Error result otherwise. * @return false|object False if no redirect is present, a WP_HTTP or WP_Error result otherwise.
*/ */
static function handle_redirects( $url, $args, $response ) { public static function handle_redirects( $url, $args, $response ) {
// If no redirects are present, or, redirects were not requested, perform no action. // If no redirects are present, or, redirects were not requested, perform no action.
if ( ! isset( $response['headers']['location'] ) || 0 === $args['_redirection'] ) if ( ! isset( $response['headers']['location'] ) || 0 === $args['_redirection'] )
return false; return false;
@ -751,7 +751,7 @@ class WP_Http {
* @param string $maybe_ip A suspected IP address * @param string $maybe_ip A suspected IP address
* @return integer|bool Upon success, '4' or '6' to represent a IPv4 or IPv6 address, false upon failure * @return integer|bool Upon success, '4' or '6' to represent a IPv4 or IPv6 address, false upon failure
*/ */
static function is_ip_address( $maybe_ip ) { public static function is_ip_address( $maybe_ip ) {
if ( preg_match( '/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $maybe_ip ) ) if ( preg_match( '/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $maybe_ip ) )
return 4; return 4;
@ -783,7 +783,7 @@ class WP_Http_Streams {
* @param string|array $args Optional. Override the defaults. * @param string|array $args Optional. Override the defaults.
* @return array 'headers', 'body', 'response', 'cookies' and 'filename' keys. * @return array 'headers', 'body', 'response', 'cookies' and 'filename' keys.
*/ */
function request($url, $args = array()) { public function request($url, $args = array()) {
$defaults = array( $defaults = array(
'method' => 'GET', 'timeout' => 5, 'method' => 'GET', 'timeout' => 5,
'redirection' => 5, 'httpversion' => '1.0', 'redirection' => 5, 'httpversion' => '1.0',
@ -1067,7 +1067,7 @@ class WP_Http_Streams {
* @param string $host The hostname being requested * @param string $host The hostname being requested
* @return bool If the cerficiate presented in $stream is valid for $host * @return bool If the cerficiate presented in $stream is valid for $host
*/ */
static function verify_ssl_certificate( $stream, $host ) { public static function verify_ssl_certificate( $stream, $host ) {
$context_options = stream_context_get_options( $stream ); $context_options = stream_context_get_options( $stream );
if ( empty( $context_options['ssl']['peer_certificate'] ) ) if ( empty( $context_options['ssl']['peer_certificate'] ) )
@ -1218,7 +1218,7 @@ class WP_Http_Curl {
* @param str|array $args Optional. Override the defaults. * @param str|array $args Optional. Override the defaults.
* @return array 'headers', 'body', 'response', 'cookies' and 'filename' keys. * @return array 'headers', 'body', 'response', 'cookies' and 'filename' keys.
*/ */
function request($url, $args = array()) { public function request($url, $args = array()) {
$defaults = array( $defaults = array(
'method' => 'GET', 'timeout' => 5, 'method' => 'GET', 'timeout' => 5,
'redirection' => 5, 'httpversion' => '1.0', 'redirection' => 5, 'httpversion' => '1.0',
@ -1543,7 +1543,7 @@ class WP_HTTP_Proxy {
* *
* @return bool * @return bool
*/ */
function is_enabled() { public function is_enabled() {
return defined('WP_PROXY_HOST') && defined('WP_PROXY_PORT'); return defined('WP_PROXY_HOST') && defined('WP_PROXY_PORT');
} }
@ -1557,7 +1557,7 @@ class WP_HTTP_Proxy {
* *
* @return bool * @return bool
*/ */
function use_authentication() { public function use_authentication() {
return defined('WP_PROXY_USERNAME') && defined('WP_PROXY_PASSWORD'); return defined('WP_PROXY_USERNAME') && defined('WP_PROXY_PASSWORD');
} }
@ -1568,7 +1568,7 @@ class WP_HTTP_Proxy {
* *
* @return string * @return string
*/ */
function host() { public function host() {
if ( defined('WP_PROXY_HOST') ) if ( defined('WP_PROXY_HOST') )
return WP_PROXY_HOST; return WP_PROXY_HOST;
@ -1582,7 +1582,7 @@ class WP_HTTP_Proxy {
* *
* @return string * @return string
*/ */
function port() { public function port() {
if ( defined('WP_PROXY_PORT') ) if ( defined('WP_PROXY_PORT') )
return WP_PROXY_PORT; return WP_PROXY_PORT;
@ -1596,7 +1596,7 @@ class WP_HTTP_Proxy {
* *
* @return string * @return string
*/ */
function username() { public function username() {
if ( defined('WP_PROXY_USERNAME') ) if ( defined('WP_PROXY_USERNAME') )
return WP_PROXY_USERNAME; return WP_PROXY_USERNAME;
@ -1610,7 +1610,7 @@ class WP_HTTP_Proxy {
* *
* @return string * @return string
*/ */
function password() { public function password() {
if ( defined('WP_PROXY_PASSWORD') ) if ( defined('WP_PROXY_PASSWORD') )
return WP_PROXY_PASSWORD; return WP_PROXY_PASSWORD;
@ -1624,7 +1624,7 @@ class WP_HTTP_Proxy {
* *
* @return string * @return string
*/ */
function authentication() { public function authentication() {
return $this->username() . ':' . $this->password(); return $this->username() . ':' . $this->password();
} }
@ -1635,7 +1635,7 @@ class WP_HTTP_Proxy {
* *
* @return string * @return string
*/ */
function authentication_header() { public function authentication_header() {
return 'Proxy-Authorization: Basic ' . base64_encode( $this->authentication() ); return 'Proxy-Authorization: Basic ' . base64_encode( $this->authentication() );
} }
@ -1652,7 +1652,7 @@ class WP_HTTP_Proxy {
* @param string $uri URI to check. * @param string $uri URI to check.
* @return bool True, to send through the proxy and false if, the proxy should not be used. * @return bool True, to send through the proxy and false if, the proxy should not be used.
*/ */
function send_through_proxy( $uri ) { public function send_through_proxy( $uri ) {
// parse_url() only handles http, https type URLs, and will emit E_WARNING on failure. // parse_url() only handles http, https type URLs, and will emit E_WARNING on failure.
// This will be displayed on blogs, which is not reasonable. // This will be displayed on blogs, which is not reasonable.
$check = @parse_url($uri); $check = @parse_url($uri);
@ -1726,7 +1726,7 @@ class WP_Http_Cookie {
* @since 2.8.0 * @since 2.8.0
* @var string * @var string
*/ */
var $name; public $name;
/** /**
* Cookie value. * Cookie value.
@ -1734,7 +1734,7 @@ class WP_Http_Cookie {
* @since 2.8.0 * @since 2.8.0
* @var string * @var string
*/ */
var $value; public $value;
/** /**
* When the cookie expires. * When the cookie expires.
@ -1742,7 +1742,7 @@ class WP_Http_Cookie {
* @since 2.8.0 * @since 2.8.0
* @var string * @var string
*/ */
var $expires; public $expires;
/** /**
* Cookie URL path. * Cookie URL path.
@ -1750,7 +1750,7 @@ class WP_Http_Cookie {
* @since 2.8.0 * @since 2.8.0
* @var string * @var string
*/ */
var $path; public $path;
/** /**
* Cookie Domain. * Cookie Domain.
@ -1758,7 +1758,7 @@ class WP_Http_Cookie {
* @since 2.8.0 * @since 2.8.0
* @var string * @var string
*/ */
var $domain; public $domain;
/** /**
* Sets up this cookie object. * Sets up this cookie object.
@ -1782,7 +1782,7 @@ class WP_Http_Cookie {
* @param string|array $data Raw cookie data. * @param string|array $data Raw cookie data.
* @param string $requested_url The URL which the cookie was set on, used for default 'domain' and 'port' values * @param string $requested_url The URL which the cookie was set on, used for default 'domain' and 'port' values
*/ */
function __construct( $data, $requested_url = '' ) { public function __construct( $data, $requested_url = '' ) {
if ( $requested_url ) if ( $requested_url )
$arrURL = @parse_url( $requested_url ); $arrURL = @parse_url( $requested_url );
if ( isset( $arrURL['host'] ) ) if ( isset( $arrURL['host'] ) )
@ -1842,7 +1842,7 @@ class WP_Http_Cookie {
* @param string $url URL you intend to send this cookie to * @param string $url URL you intend to send this cookie to
* @return boolean true if allowed, false otherwise. * @return boolean true if allowed, false otherwise.
*/ */
function test( $url ) { public function test( $url ) {
if ( is_null( $this->name ) ) if ( is_null( $this->name ) )
return false; return false;
@ -1886,7 +1886,7 @@ class WP_Http_Cookie {
* *
* @return string Header encoded cookie name and value. * @return string Header encoded cookie name and value.
*/ */
function getHeaderValue() { public function getHeaderValue() {
if ( ! isset( $this->name ) || ! isset( $this->value ) ) if ( ! isset( $this->name ) || ! isset( $this->value ) )
return ''; return '';
@ -1909,7 +1909,7 @@ class WP_Http_Cookie {
* *
* @return string * @return string
*/ */
function getFullHeader() { public function getFullHeader() {
return 'Cookie: ' . $this->getHeaderValue(); return 'Cookie: ' . $this->getHeaderValue();
} }
} }