rmccue / Requests

library/Requests/Session.php

Doc Comments +1 added lines, -1 removed lines

@@ -252,7 +252,7 @@
 	 *
 	 * @param array   $request Request data (same form as {@see request_multiple}).
 	 * @param boolean $merge_options Should we merge options as well?.
-	 * @return array  Request data
+	 * @return string  Request data
 	 */
 	protected function merge_request( $request, $merge_options = true ) {
 		if ( null !== $this->url ) {

Spacing +45 added lines, -45 removed lines

@@ -65,13 +65,13 @@ 
 	 * @param array       $data Default data for requests.
 	 * @param array       $options Default options for requests.
 	 */
-	public function __construct( $url = null, $headers = array(), $data = array(), $options = array() ) {
+	public function __construct($url = null, $headers = array(), $data = array(), $options = array()) {
 		$this->url     = $url;
 		$this->headers = $headers;
 		$this->data    = $data;
 		$this->options = $options;
 
-		if ( empty( $this->options['cookies'] ) ) {
+		if (empty($this->options['cookies'])) {
 			$this->options['cookies'] = new Requests_Cookie_Jar();
 		}
 	}
@@ -82,9 +82,9 @@ 
 	 * @param string $key Property key.
 	 * @return mixed|null Property value, null if none found
 	 */
-	public function __get( $key ) {
-		if ( isset( $this->options[ $key ] ) ) {
-			return $this->options[ $key ];
+	public function __get($key) {
+		if (isset($this->options[$key])) {
+			return $this->options[$key];
 		}
 
 		return null;
@@ -96,8 +96,8 @@ 
 	 * @param string $key Property key.
 	 * @param mixed  $value Property value.
 	 */
-	public function __set( $key, $value ) {
-		$this->options[ $key ] = $value;
+	public function __set($key, $value) {
+		$this->options[$key] = $value;
 	}
 
 	/**
@@ -105,8 +105,8 @@ 
 	 *
 	 * @param string $key Property key.
 	 */
-	public function __isset( $key ) {
-		return isset( $this->options[ $key ] );
+	public function __isset($key) {
+		return isset($this->options[$key]);
 	}
 
 	/**
@@ -114,9 +114,9 @@ 
 	 *
 	 * @param string $key Property key.
 	 */
-	public function __unset( $key ) {
-		if ( isset( $this->options[ $key ] ) ) {
-			unset( $this->options[ $key ] );
+	public function __unset($key) {
+		if (isset($this->options[$key])) {
+			unset($this->options[$key]);
 		}
 	}
 
@@ -129,8 +129,8 @@ 
 	 * @param  array  $options Options for the request (see {@see Requests::request}).
 	 * @return Requests_Response
 	 */
-	public function get( $url, $headers = array(), $options = array() ) {
-		return $this->request( $url, $headers, null, Requests::GET, $options );
+	public function get($url, $headers = array(), $options = array()) {
+		return $this->request($url, $headers, null, Requests::GET, $options);
 	}
 
 	/**
@@ -141,8 +141,8 @@ 
 	 * @param  array  $options Options for the request (see {@see Requests::request}).
 	 * @return Requests_Response
 	 */
-	public function head( $url, $headers = array(), $options = array() ) {
-		return $this->request( $url, $headers, null, Requests::HEAD, $options );
+	public function head($url, $headers = array(), $options = array()) {
+		return $this->request($url, $headers, null, Requests::HEAD, $options);
 	}
 
 	/**
@@ -153,8 +153,8 @@ 
 	 * @param  array  $options Options for the request (see {@see Requests::request}).
 	 * @return Requests_Response
 	 */
-	public function delete( $url, $headers = array(), $options = array() ) {
-		return $this->request( $url, $headers, null, Requests::DELETE, $options );
+	public function delete($url, $headers = array(), $options = array()) {
+		return $this->request($url, $headers, null, Requests::DELETE, $options);
 	}
 
 	/**
@@ -167,8 +167,8 @@ 
 	 * @param array      $options Options for the request (see {@see Requests::request}).
 	 * @return Requests_Response
 	 */
-	public function post( $url, $headers = array(), $data = array(), $options = array() ) {
-		return $this->request( $url, $headers, $data, Requests::POST, $options );
+	public function post($url, $headers = array(), $data = array(), $options = array()) {
+		return $this->request($url, $headers, $data, Requests::POST, $options);
 	}
 
 	/**
@@ -180,8 +180,8 @@ 
 	 * @param  array      $options Options for the request (see {@see Requests::request}).
 	 * @return Requests_Response
 	 */
-	public function put( $url, $headers = array(), $data = array(), $options = array() ) {
-		return $this->request( $url, $headers, $data, Requests::PUT, $options );
+	public function put($url, $headers = array(), $data = array(), $options = array()) {
+		return $this->request($url, $headers, $data, Requests::PUT, $options);
 	}
 
 	/**
@@ -198,8 +198,8 @@ 
 	 * @param  array      $options Options for the request (see {@see Requests::request}).
 	 * @return Requests_Response
 	 */
-	public function patch( $url, $headers, $data = array(), $options = array() ) {
-		return $this->request( $url, $headers, $data, Requests::PATCH, $options );
+	public function patch($url, $headers, $data = array(), $options = array()) {
+		return $this->request($url, $headers, $data, Requests::PATCH, $options);
 	}
 
 	/**
@@ -219,10 +219,10 @@ 
 	 * @param array      $options Options for the request (see {@see Requests::request}).
 	 * @return Requests_Response
 	 */
-	public function request( $url, $headers = array(), $data = array(), $type = Requests::GET, $options = array() ) {
-		$request = $this->merge_request( compact( 'url', 'headers', 'data', 'options' ) );
+	public function request($url, $headers = array(), $data = array(), $type = Requests::GET, $options = array()) {
+		$request = $this->merge_request(compact('url', 'headers', 'data', 'options'));
 
-		return Requests::request( $request['url'], $request['headers'], $request['data'], $type, $request['options'] );
+		return Requests::request($request['url'], $request['headers'], $request['data'], $type, $request['options']);
 	}
 
 	/**
@@ -234,17 +234,17 @@ 
 	 * @param array $options   Global and default options (see {@see Requests::request}).
 	 * @return array Responses (either Requests_Response or a Requests_Exception object).
 	 */
-	public function request_multiple( $requests, $options = array() ) {
-		foreach ( $requests as $key => $request ) {
-			$requests[ $key ] = $this->merge_request( $request, false );
+	public function request_multiple($requests, $options = array()) {
+		foreach ($requests as $key => $request) {
+			$requests[$key] = $this->merge_request($request, false);
 		}
 
-		$options = array_merge( $this->options, $options );
+		$options = array_merge($this->options, $options);
 
 		// Disallow forcing the type, as that's a per request setting.
-		unset( $options['type'] );
+		unset($options['type']);
 
-		return Requests::request_multiple( $requests, $options );
+		return Requests::request_multiple($requests, $options);
 	}
 
 	/**
@@ -254,30 +254,30 @@ 
 	 * @param boolean $merge_options Should we merge options as well?.
 	 * @return array  Request data
 	 */
-	protected function merge_request( $request, $merge_options = true ) {
-		if ( null !== $this->url ) {
-			$request['url'] = Requests_IRI::absolutize( $this->url, $request['url'] );
+	protected function merge_request($request, $merge_options = true) {
+		if (null !== $this->url) {
+			$request['url'] = Requests_IRI::absolutize($this->url, $request['url']);
 			$request['url'] = $request['url']->uri;
 		}
 
-		if ( empty( $request['headers'] ) ) {
+		if (empty($request['headers'])) {
 			$request['headers'] = array();
 		}
-		$request['headers'] = array_merge( $this->headers, $request['headers'] );
+		$request['headers'] = array_merge($this->headers, $request['headers']);
 
-		if ( empty( $request['data'] ) ) {
-			if ( is_array( $this->data ) ) {
+		if (empty($request['data'])) {
+			if (is_array($this->data)) {
 				$request['data'] = $this->data;
 			}
-		} elseif ( is_array( $request['data'] ) && is_array( $this->data ) ) {
-			$request['data'] = array_merge( $this->data, $request['data'] );
+		} elseif (is_array($request['data']) && is_array($this->data)) {
+			$request['data'] = array_merge($this->data, $request['data']);
 		}
 
-		if ( false !== $merge_options ) {
-			$request['options'] = array_merge( $this->options, $request['options'] );
+		if (false !== $merge_options) {
+			$request['options'] = array_merge($this->options, $request['options']);
 
 			// Disallow forcing the type, as that's a per request setting.
-			unset( $request['options']['type'] );
+			unset($request['options']['type']);
 		}
 
 		return $request;

Braces +2 added lines, -1 removed lines

@@ -269,7 +269,8 @@
 			if ( is_array( $this->data ) ) {
 				$request['data'] = $this->data;
 			}
-		} elseif ( is_array( $request['data'] ) && is_array( $this->data ) ) {
+		}
+		elseif ( is_array( $request['data'] ) && is_array( $this->data ) ) {
 			$request['data'] = array_merge( $this->data, $request['data'] );
 		}