Pass args in expected order, and allow $data as an option too

danielbachhuber · danielbachhuber · commit ec52a45ca125 · 2014-08-21T15:44:24.000-07:00
diff --git a/php/WP_CLI/CoreUpgrader.php b/php/WP_CLI/CoreUpgrader.php
@@ -56,7 +56,7 @@ function download_package( $package ) {
 
 			$this->skin->feedback( 'downloading_package', $package );
 
-			Utils\http_request( 'GET', $package, $headers, $options );
+			Utils\http_request( 'GET', $package, null, $headers, $options );
 			$cache->import( $cache_key, $temp );
 			return $temp;
 		}
diff --git a/php/commands/core.php b/php/commands/core.php
@@ -75,7 +75,7 @@ public function download( $args, $assoc_args ) {
 				'filename' => $temp
 			);
 
-			Utils\http_request( 'GET', $download_url, $headers, $options );
+			Utils\http_request( 'GET', $download_url, null, $headers, $options );
 			self::_extract( $temp, ABSPATH );
 			$cache->import( $cache_key, $temp );
 			unlink($temp);
@@ -136,7 +136,7 @@ private static function _rmdir( $dir ) {
 
 	private static function _read( $url ) {
 		$headers = array('Accept' => 'application/json');
-		return Utils\http_request( 'GET', $url, $headers )->body;
+		return Utils\http_request( 'GET', $url, null, $headers )->body;
 	}
 
 	private function get_download_offer( $locale ) {
@@ -659,11 +659,11 @@ private static function get_core_checksums( $version, $locale ) {
 		$headers = array(
 			'Accept' => 'application/json'
 		);
-		$response = Utils\http_request( 'GET', $url, $headers, $options );
+		$response = Utils\http_request( 'GET', $url, null, $headers, $options );
 
 		if ( $ssl && ! $response->success ) {
 			WP_CLI::warning( 'wp-cli could not establish a secure connection to WordPress.org. Please contact your server administrator.' );
-			$response = Utils\http_request( 'GET', $http_url, $headers, $options );
+			$response = Utils\http_request( 'GET', $http_url, null, $headers, $options );
 		}
 
 		if ( ! $response->success || 200 != $response->status_code )
diff --git a/php/utils.php b/php/utils.php
@@ -411,7 +411,7 @@ function replace_path_consts( $source, $path ) {
  * @param array $options
  * @return object
  */
-function http_request( $method, $url, $headers = array(), $options = array() ) {
+function http_request( $method, $url, $data = null, $headers = array(), $options = array() ) {
 	$pem_copied = false;
 
 	// cURL can't read Phar archives
@@ -426,7 +426,7 @@ function http_request( $method, $url, $headers = array(), $options = array() ) {
 	}
 
 	try {
-		$request = \Requests::request( $url, null, $method, $headers, $options );
+		$request = \Requests::request( $url, $headers, $data, $method, $options );
 		if ( $pem_copied ) {
 			unlink( $options['verify'] );
 		}
@@ -439,7 +439,7 @@ function http_request( $method, $url, $headers = array(), $options = array() ) {
 		}
 		$options['verify'] = false;
 		try {
-			return \Requests::request( $url, null, $method, $headers, $options );
+			return \Requests::request( $url, $headers, $data, $method, $options );
 		} catch( \Requests_Exception $ex ) {
 			\WP_CLI::error( $ex->getMessage() );
 		}

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ function download_package( $package ) {`
`56`	`56`
`57`	`57`	`$this->skin->feedback( 'downloading_package', $package );`
`58`	`58`
`59`		`- Utils\http_request( 'GET', $package, $headers, $options );`
	`59`	`+ Utils\http_request( 'GET', $package, null, $headers, $options );`
`60`	`60`	`$cache->import( $cache_key, $temp );`
`61`	`61`	`return $temp;`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -411,7 +411,7 @@ function replace_path_consts( $source, $path ) {`
`411`	`411`	`* @param array $options`
`412`	`412`	`* @return object`
`413`	`413`	`*/`
`414`		`-function http_request( $method, $url, $headers = array(), $options = array() ) {`
	`414`	`+function http_request( $method, $url, $data = null, $headers = array(), $options = array() ) {`
`415`	`415`	`$pem_copied = false;`
`416`	`416`
`417`	`417`	`// cURL can't read Phar archives`
`@@ -426,7 +426,7 @@ function http_request( $method, $url, $headers = array(), $options = array() ) {`
`426`	`426`	`}`
`427`	`427`
`428`	`428`	`try {`
`429`		`- $request = \Requests::request( $url, null, $method, $headers, $options );`
	`429`	`+ $request = \Requests::request( $url, $headers, $data, $method, $options );`
`430`	`430`	`if ( $pem_copied ) {`
`431`	`431`	`unlink( $options['verify'] );`
`432`	`432`	`}`
`@@ -439,7 +439,7 @@ function http_request( $method, $url, $headers = array(), $options = array() ) {`
`439`	`439`	`}`
`440`	`440`	`$options['verify'] = false;`
`441`	`441`	`try {`
`442`		`- return \Requests::request( $url, null, $method, $headers, $options );`
	`442`	`+ return \Requests::request( $url, $headers, $data, $method, $options );`
`443`	`443`	`} catch( \Requests_Exception $ex ) {`
`444`	`444`	`\WP_CLI::error( $ex->getMessage() );`
`445`	`445`	`}`