mmainstreet / jodel-web

php/Requests/libary/Requests.php

Doc Comments +3 added lines

@@ -226,6 +226,7 @@ 
 	 */
 	/**
 	 * Send a GET request
+	 * @param string $url
 	 */
 	public static function get($url, $headers = array(), $options = array()) {
 		return self::request($url, $headers, null, self::GET, $options);
@@ -263,12 +264,14 @@ 
 	 */
 	/**
 	 * Send a POST request
+	 * @param string $url
 	 */
 	public static function post($url, $headers = array(), $data = array(), $options = array()) {
 		return self::request($url, $headers, $data, self::POST, $options);
 	}
 	/**
 	 * Send a PUT request
+	 * @param string $url
 	 */
 	public static function put($url, $headers = array(), $data = array(), $options = array()) {
 		return self::request($url, $headers, $data, self::PUT, $options);

Braces +237 added lines, -118 removed lines

@@ -18,7 +18,8 @@ 
  *
  * @package Requests
  */
-class Requests {
+class Requests
+{
 	/**
 	 * POST method
 	 *
@@ -121,7 +122,9 @@ 
 	 *
 	 * @codeCoverageIgnore
 	 */
-	private function __construct() {}
+	private function __construct()
+	{
+}
 
 	/**
 	 * Autoloader for Requests
@@ -135,14 +138,17 @@ 
 	 *
 	 * @param string $class Class name to load
 	 */
-	public static function autoloader($class) {
+	public static function autoloader($class)
+	{
 		// Check that the class starts with "Requests"
-		if (strpos($class, 'Requests') !== 0) {
+		if (strpos($class, 'Requests') !== 0)
+		{
 			return;
 		}
 
 		$file = str_replace('_', '/', $class);
-		if (file_exists(dirname(__FILE__) . '/' . $file . '.php')) {
+		if (file_exists(dirname(__FILE__) . '/' . $file . '.php'))
+		{
 			require_once(dirname(__FILE__) . '/' . $file . '.php');
 		}
 	}
@@ -152,7 +158,8 @@ 
 	 *
 	 * @codeCoverageIgnore
 	 */
-	public static function register_autoloader() {
+	public static function register_autoloader()
+	{
 		spl_autoload_register(array('Requests', 'autoloader'));
 	}
 
@@ -161,8 +168,10 @@ 
 	 *
 	 * @param string $transport Transport class to add, must support the Requests_Transport interface
 	 */
-	public static function add_transport($transport) {
-		if (empty(self::$transports)) {
+	public static function add_transport($transport)
+	{
+		if (empty(self::$transports))
+		{
 			self::$transports = array(
 				'Requests_Transport_cURL',
 				'Requests_Transport_fsockopen',
@@ -178,7 +187,8 @@ 
 	 * @throws Requests_Exception If no valid transport is found (`notransport`)
 	 * @return Requests_Transport
 	 */
-	protected static function get_transport($capabilities = array()) {
+	protected static function get_transport($capabilities = array())
+	{
 		// Caching code, don't bother testing coverage
 		// @codeCoverageIgnoreStart
 		// array of capabilities as a string to be used as an array key
@@ -186,12 +196,14 @@ 
 		$cap_string = serialize($capabilities);
 
 		// Don't search for a transport if it's already been done for these $capabilities
-		if (isset(self::$transport[$cap_string]) && self::$transport[$cap_string] !== null) {
+		if (isset(self::$transport[$cap_string]) && self::$transport[$cap_string] !== null)
+		{
 			return new self::$transport[$cap_string]();
 		}
 		// @codeCoverageIgnoreEnd
 
-		if (empty(self::$transports)) {
+		if (empty(self::$transports))
+		{
 			self::$transports = array(
 				'Requests_Transport_cURL',
 				'Requests_Transport_fsockopen',
@@ -199,18 +211,22 @@ 
 		}
 
 		// Find us a working transport
-		foreach (self::$transports as $class) {
-			if (!class_exists($class)) {
+		foreach (self::$transports as $class)
+		{
+			if (!class_exists($class))
+			{
 				continue;
 			}
 
 			$result = call_user_func(array($class, 'test'), $capabilities);
-			if ($result) {
+			if ($result)
+			{
 				self::$transport[$cap_string] = $class;
 				break;
 			}
 		}
-		if (self::$transport[$cap_string] === null) {
+		if (self::$transport[$cap_string] === null)
+		{
 			throw new Requests_Exception('No working transports found', 'notransport', self::$transports);
 		}
 
@@ -227,28 +243,32 @@ 
 	/**
 	 * Send a GET request
 	 */
-	public static function get($url, $headers = array(), $options = array()) {
+	public static function get($url, $headers = array(), $options = array())
+	{
 		return self::request($url, $headers, null, self::GET, $options);
 	}
 
 	/**
 	 * Send a HEAD request
 	 */
-	public static function head($url, $headers = array(), $options = array()) {
+	public static function head($url, $headers = array(), $options = array())
+	{
 		return self::request($url, $headers, null, self::HEAD, $options);
 	}
 
 	/**
 	 * Send a DELETE request
 	 */
-	public static function delete($url, $headers = array(), $options = array()) {
+	public static function delete($url, $headers = array(), $options = array())
+	{
 		return self::request($url, $headers, null, self::DELETE, $options);
 	}
 
 	/**
 	 * Send a TRACE request
 	 */
-	public static function trace($url, $headers = array(), $options = array()) {
+	public static function trace($url, $headers = array(), $options = array())
+	{
 		return self::request($url, $headers, null, self::TRACE, $options);
 	}
 	/**#@-*/
@@ -264,20 +284,23 @@ 
 	/**
 	 * Send a POST request
 	 */
-	public static function post($url, $headers = array(), $data = array(), $options = array()) {
+	public static function post($url, $headers = array(), $data = array(), $options = array())
+	{
 		return self::request($url, $headers, $data, self::POST, $options);
 	}
 	/**
 	 * Send a PUT request
 	 */
-	public static function put($url, $headers = array(), $data = array(), $options = array()) {
+	public static function put($url, $headers = array(), $data = array(), $options = array())
+	{
 		return self::request($url, $headers, $data, self::PUT, $options);
 	}
 
 	/**
 	 * Send an OPTIONS request
 	 */
-	public static function options($url, $headers = array(), $data = array(), $options = array()) {
+	public static function options($url, $headers = array(), $data = array(), $options = array())
+	{
 		return self::request($url, $headers, $data, self::OPTIONS, $options);
 	}
 
@@ -289,7 +312,8 @@ 
 	 *
 	 * @link https://tools.ietf.org/html/rfc5789
 	 */
-	public static function patch($url, $headers, $data = array(), $options = array()) {
+	public static function patch($url, $headers, $data = array(), $options = array())
+	{
 		return self::request($url, $headers, $data, self::PATCH, $options);
 	}
 	/**#@-*/
@@ -354,8 +378,10 @@ 
 	 * @param array $options Options for the request (see description for more information)
 	 * @return Requests_Response
 	 */
-	public static function request($url, $headers = array(), $data = array(), $type = self::GET, $options = array()) {
-		if (empty($options['type'])) {
+	public static function request($url, $headers = array(), $data = array(), $type = self::GET, $options = array())
+	{
+		if (empty($options['type']))
+		{
 			$options['type'] = $type;
 		}
 		$options = array_merge(self::get_default_options(), $options);
@@ -364,14 +390,17 @@ 
 
 		$options['hooks']->dispatch('requests.before_request', array(&$url, &$headers, &$data, &$type, &$options));
 
-		if (!empty($options['transport'])) {
+		if (!empty($options['transport']))
+		{
 			$transport = $options['transport'];
 
-			if (is_string($options['transport'])) {
+			if (is_string($options['transport']))
+			{
 				$transport = new $transport();
 			}
 		}
-		else {
+		else
+		{
 			$need_ssl = (0 === stripos($url, 'https://'));
 			$capabilities = array('ssl' => $need_ssl);
 			$transport = self::get_transport($capabilities);
@@ -424,32 +453,42 @@ 
 	 * @param array $options Global and default options (see {@see Requests::request})
 	 * @return array Responses (either Requests_Response or a Requests_Exception object)
 	 */
-	public static function request_multiple($requests, $options = array()) {
+	public static function request_multiple($requests, $options = array())
+	{
 		$options = array_merge(self::get_default_options(true), $options);
 
-		if (!empty($options['hooks'])) {
+		if (!empty($options['hooks']))
+		{
 			$options['hooks']->register('transport.internal.parse_response', array('Requests', 'parse_multiple'));
-			if (!empty($options['complete'])) {
+			if (!empty($options['complete']))
+			{
 				$options['hooks']->register('multiple.request.complete', $options['complete']);
 			}
 		}
 
-		foreach ($requests as $id => &$request) {
-			if (!isset($request['headers'])) {
+		foreach ($requests as $id => &$request)
+		{
+			if (!isset($request['headers']))
+			{
 				$request['headers'] = array();
 			}
-			if (!isset($request['data'])) {
+			if (!isset($request['data']))
+			{
 				$request['data'] = array();
 			}
-			if (!isset($request['type'])) {
+			if (!isset($request['type']))
+			{
 				$request['type'] = self::GET;
 			}
-			if (!isset($request['options'])) {
+			if (!isset($request['options']))
+			{
 				$request['options'] = $options;
 				$request['options']['type'] = $request['type'];
 			}
-			else {
-				if (empty($request['options']['type'])) {
+			else
+			{
+				if (empty($request['options']['type']))
+				{
 					$request['options']['type'] = $request['type'];
 				}
 				$request['options'] = array_merge($options, $request['options']);
@@ -458,31 +497,38 @@ 
 			self::set_defaults($request['url'], $request['headers'], $request['data'], $request['type'], $request['options']);
 
 			// Ensure we only hook in once
-			if ($request['options']['hooks'] !== $options['hooks']) {
+			if ($request['options']['hooks'] !== $options['hooks'])
+			{
 				$request['options']['hooks']->register('transport.internal.parse_response', array('Requests', 'parse_multiple'));
-				if (!empty($request['options']['complete'])) {
+				if (!empty($request['options']['complete']))
+				{
 					$request['options']['hooks']->register('multiple.request.complete', $request['options']['complete']);
 				}
 			}
 		}
 		unset($request);
 
-		if (!empty($options['transport'])) {
+		if (!empty($options['transport']))
+		{
 			$transport = $options['transport'];
 
-			if (is_string($options['transport'])) {
+			if (is_string($options['transport']))
+			{
 				$transport = new $transport();
 			}
 		}
-		else {
+		else
+		{
 			$transport = self::get_transport();
 		}
 		$responses = $transport->request_multiple($requests, $options);
 
-		foreach ($responses as $id => &$response) {
+		foreach ($responses as $id => &$response)
+		{
 			// If our hook got messed with somehow, ensure we end up with the
 			// correct response
-			if (is_string($response)) {
+			if (is_string($response))
+			{
 				$request = $requests[$id];
 				self::parse_multiple($response, $request);
 				$request['options']['hooks']->dispatch('multiple.request.complete', array(&$response, $id));
@@ -499,7 +545,8 @@ 
 	 * @param boolean $multirequest Is this a multirequest?
 	 * @return array Default option values
 	 */
-	protected static function get_default_options($multirequest = false) {
+	protected static function get_default_options($multirequest = false)
+	{
 		$defaults = array(
 			'timeout' => 10,
 			'connect_timeout' => 10,
@@ -521,7 +568,8 @@ 
 			'verify' => Requests::get_certificate_path(),
 			'verifyname' => true,
 		);
-		if ($multirequest !== false) {
+		if ($multirequest !== false)
+		{
 			$defaults['complete'] = null;
 		}
 		return $defaults;
@@ -532,8 +580,10 @@ 
 	 *
 	 * @return string Default certificate path.
 	 */
-	public static function get_certificate_path() {
-		if ( ! empty( Requests::$certificate_path ) ) {
+	public static function get_certificate_path()
+	{
+		if ( ! empty( Requests::$certificate_path ) )
+		{
 			return Requests::$certificate_path;
 		}
 
@@ -545,7 +595,8 @@ 
 	 *
 	 * @param string $path Certificate path, pointing to a PEM file.
 	 */
-	public static function set_certificate_path( $path ) {
+	public static function set_certificate_path( $path )
+	{
 		Requests::$certificate_path = $path;
 	}
 
@@ -559,40 +610,51 @@ 
 	 * @param array $options Options for the request
 	 * @return array $options
 	 */
-	protected static function set_defaults(&$url, &$headers, &$data, &$type, &$options) {
-		if (!preg_match('/^http(s)?:\/\//i', $url, $matches)) {
+	protected static function set_defaults(&$url, &$headers, &$data, &$type, &$options)
+	{
+		if (!preg_match('/^http(s)?:\/\//i', $url, $matches))
+		{
 			throw new Requests_Exception('Only HTTP(S) requests are handled.', 'nonhttp', $url);
 		}
 
-		if (empty($options['hooks'])) {
+		if (empty($options['hooks']))
+		{
 			$options['hooks'] = new Requests_Hooks();
 		}
 
-		if (is_array($options['auth'])) {
+		if (is_array($options['auth']))
+		{
 			$options['auth'] = new Requests_Auth_Basic($options['auth']);
 		}
-		if ($options['auth'] !== false) {
+		if ($options['auth'] !== false)
+		{
 			$options['auth']->register($options['hooks']);
 		}
 
-		if (is_string($options['proxy']) || is_array($options['proxy'])) {
+		if (is_string($options['proxy']) || is_array($options['proxy']))
+		{
 			$options['proxy'] = new Requests_Proxy_HTTP($options['proxy']);
 		}
-		if ($options['proxy'] !== false) {
+		if ($options['proxy'] !== false)
+		{
 			$options['proxy']->register($options['hooks']);
 		}
 
-		if (is_array($options['cookies'])) {
+		if (is_array($options['cookies']))
+		{
 			$options['cookies'] = new Requests_Cookie_Jar($options['cookies']);
 		}
-		elseif (empty($options['cookies'])) {
+		elseif (empty($options['cookies']))
+		{
 			$options['cookies'] = new Requests_Cookie_Jar();
 		}
-		if ($options['cookies'] !== false) {
+		if ($options['cookies'] !== false)
+		{
 			$options['cookies']->register($options['hooks']);
 		}
 
-		if ($options['idn'] !== false) {
+		if ($options['idn'] !== false)
+		{
 			$iri = new Requests_IRI($url);
 			$iri->host = Requests_IDNAEncoder::encode($iri->ihost);
 			$url = $iri->uri;
@@ -601,11 +663,14 @@ 
 		// Massage the type to ensure we support it.
 		$type = strtoupper($type);
 
-		if (!isset($options['data_format'])) {
-			if (in_array($type, array(self::HEAD, self::GET, self::DELETE))) {
+		if (!isset($options['data_format']))
+		{
+			if (in_array($type, array(self::HEAD, self::GET, self::DELETE)))
+			{
 				$options['data_format'] = 'query';
 			}
-			else {
+			else
+			{
 				$options['data_format'] = 'body';
 			}
 		}
@@ -625,17 +690,21 @@ 
 	 * @param array $options Original $options array passed to {@link request()}, in case we need to follow redirects
 	 * @return Requests_Response
 	 */
-	protected static function parse_response($headers, $url, $req_headers, $req_data, $options) {
+	protected static function parse_response($headers, $url, $req_headers, $req_data, $options)
+	{
 		$return = new Requests_Response();
-		if (!$options['blocking']) {
+		if (!$options['blocking'])
+		{
 			return $return;
 		}
 
 		$return->raw = $headers;
 		$return->url = $url;
 
-		if (!$options['filename']) {
-			if (($pos = strpos($headers, "\r\n\r\n")) === false) {
+		if (!$options['filename'])
+		{
+			if (($pos = strpos($headers, "\r\n\r\n")) === false)
+			{
 				// Crap!
 				throw new Requests_Exception('Missing header/body separator', 'requests.no_crlf_separator');
 			}
@@ -643,7 +712,8 @@ 
 			$headers = substr($return->raw, 0, $pos);
 			$return->body = substr($return->raw, $pos + strlen("\n\r\n\r"));
 		}
-		else {
+		else
+		{
 			$return->body = '';
 		}
 		// Pretend CRLF = LF for compatibility (RFC 2616, section 19.3)
@@ -652,44 +722,54 @@ 
 		$headers = preg_replace('/\n[ \t]/', ' ', $headers);
 		$headers = explode("\n", $headers);
 		preg_match('#^HTTP/(1\.\d)[ \t]+(\d+)#i', array_shift($headers), $matches);
-		if (empty($matches)) {
+		if (empty($matches))
+		{
 			throw new Requests_Exception('Response could not be parsed', 'noversion', $headers);
 		}
 		$return->protocol_version = (float) $matches[1];
 		$return->status_code = (int) $matches[2];
-		if ($return->status_code >= 200 && $return->status_code < 300) {
+		if ($return->status_code >= 200 && $return->status_code < 300)
+		{
 			$return->success = true;
 		}
 
-		foreach ($headers as $header) {
+		foreach ($headers as $header)
+		{
 			list($key, $value) = explode(':', $header, 2);
 			$value = trim($value);
 			preg_replace('#(\s+)#i', ' ', $value);
 			$return->headers[$key] = $value;
 		}
-		if (isset($return->headers['transfer-encoding'])) {
+		if (isset($return->headers['transfer-encoding']))
+		{
 			$return->body = self::decode_chunked($return->body);
 			unset($return->headers['transfer-encoding']);
 		}
-		if (isset($return->headers['content-encoding'])) {
+		if (isset($return->headers['content-encoding']))
+		{
 			$return->body = self::decompress($return->body);
 		}
 
 		//fsockopen and cURL compatibility
-		if (isset($return->headers['connection'])) {
+		if (isset($return->headers['connection']))
+		{
 			unset($return->headers['connection']);
 		}
 
 		$options['hooks']->dispatch('requests.before_redirect_check', array(&$return, $req_headers, $req_data, $options));
 
-		if ($return->is_redirect() && $options['follow_redirects'] === true) {
-			if (isset($return->headers['location']) && $options['redirected'] < $options['redirects']) {
-				if ($return->status_code === 303) {
+		if ($return->is_redirect() && $options['follow_redirects'] === true)
+		{
+			if (isset($return->headers['location']) && $options['redirected'] < $options['redirects'])
+			{
+				if ($return->status_code === 303)
+				{
 					$options['type'] = self::GET;
 				}
 				$options['redirected']++;
 				$location = $return->headers['location'];
-				if (strpos($location, 'http://') !== 0 && strpos($location, 'https://') !== 0) {
+				if (strpos($location, 'http://') !== 0 && strpos($location, 'https://') !== 0)
+				{
 					// relative redirect, for compatibility make it absolute
 					$location = Requests_IRI::absolutize($url, $location);
 					$location = $location->uri;
@@ -707,7 +787,8 @@ 
 				$redirected->history[] = $return;
 				return $redirected;
 			}
-			elseif ($options['redirected'] >= $options['redirects']) {
+			elseif ($options['redirected'] >= $options['redirects'])
+			{
 				throw new Requests_Exception('Too many redirects', 'toomanyredirects', $return);
 			}
 		}
@@ -728,15 +809,18 @@ 
 	 * @param array $request Request data as passed into {@see Requests::request_multiple()}
 	 * @return null `$response` is either set to a Requests_Response instance, or a Requests_Exception object
 	 */
-	public static function parse_multiple(&$response, $request) {
-		try {
+	public static function parse_multiple(&$response, $request)
+	{
+		try
+		{
 			$url = $request['url'];
 			$headers = $request['headers'];
 			$data = $request['data'];
 			$options = $request['options'];
 			$response = self::parse_response($response, $url, $headers, $data, $options);
 		}
-		catch (Requests_Exception $e) {
+		catch (Requests_Exception $e)
+		{
 			$response = $e;
 		}
 	}
@@ -748,8 +832,10 @@ 
 	 * @param string $data Chunked body
 	 * @return string Decoded body
 	 */
-	protected static function decode_chunked($data) {
-		if (!preg_match('/^([0-9a-f]+)(?:;(?:[\w-]*)(?:=(?:(?:[\w-]*)*|"(?:[^\r\n])*"))?)*\r\n/i', trim($data))) {
+	protected static function decode_chunked($data)
+	{
+		if (!preg_match('/^([0-9a-f]+)(?:;(?:[\w-]*)(?:=(?:(?:[\w-]*)*|"(?:[^\r\n])*"))?)*\r\n/i', trim($data)))
+		{
 			return $data;
 		}
 
@@ -758,15 +844,18 @@ 
 		$decoded = '';
 		$encoded = $data;
 
-		while (true) {
+		while (true)
+		{
 			$is_chunked = (bool) preg_match('/^([0-9a-f]+)(?:;(?:[\w-]*)(?:=(?:(?:[\w-]*)*|"(?:[^\r\n])*"))?)*\r\n/i', $encoded, $matches);
-			if (!$is_chunked) {
+			if (!$is_chunked)
+			{
 				// Looks like it's not chunked after all
 				return $data;
 			}
 
 			$length = hexdec(trim($matches[1]));
-			if ($length === 0) {
+			if ($length === 0)
+			{
 				// Ignore trailer headers
 				return $decoded;
 			}
@@ -775,7 +864,8 @@ 
 			$decoded .= substr($encoded, $chunk_length, $length);
 			$encoded = substr($encoded, $chunk_length + $length + 2);
 
-			if (trim($encoded) === '0' || empty($encoded)) {
+			if (trim($encoded) === '0' || empty($encoded))
+			{
 				return $decoded;
 			}
 		}
@@ -791,9 +881,11 @@ 
 	 * @param array $array Dictionary of header values
 	 * @return array List of headers
 	 */
-	public static function flatten($array) {
+	public static function flatten($array)
+	{
 		$return = array();
-		foreach ($array as $key => $value) {
+		foreach ($array as $key => $value)
+		{
 			$return[] = sprintf('%s: %s', $key, $value);
 		}
 		return $return;
@@ -807,7 +899,8 @@ 
 	 * @param array $array Dictionary of header values
 	 * @return array List of headers
 	 */
-	public static function flattern($array) {
+	public static function flattern($array)
+	{
 		return self::flatten($array);
 	}
 
@@ -820,22 +913,28 @@ 
 	 * @param string $data Compressed data in one of the above formats
 	 * @return string Decompressed string
 	 */
-	public static function decompress($data) {
-		if (substr($data, 0, 2) !== "\x1f\x8b" && substr($data, 0, 2) !== "\x78\x9c") {
+	public static function decompress($data)
+	{
+		if (substr($data, 0, 2) !== "\x1f\x8b" && substr($data, 0, 2) !== "\x78\x9c")
+		{
 			// Not actually compressed. Probably cURL ruining this for us.
 			return $data;
 		}
 
-		if (function_exists('gzdecode') && ($decoded = @gzdecode($data)) !== false) {
+		if (function_exists('gzdecode') && ($decoded = @gzdecode($data)) !== false)
+		{
 			return $decoded;
 		}
-		elseif (function_exists('gzinflate') && ($decoded = @gzinflate($data)) !== false) {
+		elseif (function_exists('gzinflate') && ($decoded = @gzinflate($data)) !== false)
+		{
 			return $decoded;
 		}
-		elseif (($decoded = self::compatible_gzinflate($data)) !== false) {
+		elseif (($decoded = self::compatible_gzinflate($data)) !== false)
+		{
 			return $decoded;
 		}
-		elseif (function_exists('gzuncompress') && ($decoded = @gzuncompress($data)) !== false) {
+		elseif (function_exists('gzuncompress') && ($decoded = @gzuncompress($data)) !== false)
+		{
 			return $decoded;
 		}
 
@@ -862,29 +961,37 @@ 
 	 * @param string $gzData String to decompress.
 	 * @return string|bool False on failure.
 	 */
-	public static function compatible_gzinflate($gzData) {
+	public static function compatible_gzinflate($gzData)
+	{
 		// Compressed data might contain a full zlib header, if so strip it for
 		// gzinflate()
-		if (substr($gzData, 0, 3) == "\x1f\x8b\x08") {
+		if (substr($gzData, 0, 3) == "\x1f\x8b\x08")
+		{
 			$i = 10;
 			$flg = ord(substr($gzData, 3, 1));
-			if ($flg > 0) {
-				if ($flg & 4) {
+			if ($flg > 0)
+			{
+				if ($flg & 4)
+				{
 					list($xlen) = unpack('v', substr($gzData, $i, 2));
 					$i = $i + 2 + $xlen;
 				}
-				if ($flg & 8) {
+				if ($flg & 8)
+				{
 					$i = strpos($gzData, "\0", $i) + 1;
 				}
-				if ($flg & 16) {
+				if ($flg & 16)
+				{
 					$i = strpos($gzData, "\0", $i) + 1;
 				}
-				if ($flg & 2) {
+				if ($flg & 2)
+				{
 					$i = $i + 2;
 				}
 			}
 			$decompressed = self::compatible_gzinflate(substr($gzData, $i));
-			if (false !== $decompressed) {
+			if (false !== $decompressed)
+			{
 				return $decompressed;
 			}
 		}
@@ -905,17 +1012,21 @@ 
 		// First 2 bytes should be divisible by 0x1F
 		list(, $first_two_bytes) = unpack('n', $gzData);
 
-		if (0x08 == $first_nibble && 0 == ($first_two_bytes % 0x1F)) {
+		if (0x08 == $first_nibble && 0 == ($first_two_bytes % 0x1F))
+		{
 			$huffman_encoded = true;
 		}
 
-		if ($huffman_encoded) {
-			if (false !== ($decompressed = @gzinflate(substr($gzData, 2)))) {
+		if ($huffman_encoded)
+		{
+			if (false !== ($decompressed = @gzinflate(substr($gzData, 2))))
+			{
 				return $decompressed;
 			}
 		}
 
-		if ("\x50\x4b\x03\x04" == substr($gzData, 0, 4)) {
+		if ("\x50\x4b\x03\x04" == substr($gzData, 0, 4))
+		{
 			// ZIP file format header
 			// Offset 6: 2 bytes, General-purpose field
 			// Offset 26: 2 bytes, filename length
@@ -929,7 +1040,8 @@ 
 			// between a compressed document, and a ZIP file
 			$zip_compressed_on_the_fly = (0x08 == (0x08 & $general_purpose_flag));
 
-			if (!$zip_compressed_on_the_fly) {
+			if (!$zip_compressed_on_the_fly)
+			{
 				// Don't attempt to decode a compressed zip file
 				return $gzData;
 			}
@@ -937,29 +1049,34 @@ 
 			// Determine the first byte of data, based on the above ZIP header
 			// offsets:
 			$first_file_start = array_sum(unpack('v2', substr($gzData, 26, 4)));
-			if (false !== ($decompressed = @gzinflate(substr($gzData, 30 + $first_file_start)))) {
+			if (false !== ($decompressed = @gzinflate(substr($gzData, 30 + $first_file_start))))
+			{
 				return $decompressed;
 			}
 			return false;
 		}
 
 		// Finally fall back to straight gzinflate
-		if (false !== ($decompressed = @gzinflate($gzData))) {
+		if (false !== ($decompressed = @gzinflate($gzData)))
+		{
 			return $decompressed;
 		}
 
 		// Fallback for all above failing, not expected, but included for
 		// debugging and preventing regressions and to track stats
-		if (false !== ($decompressed = @gzinflate(substr($gzData, 2)))) {
+		if (false !== ($decompressed = @gzinflate(substr($gzData, 2))))
+		{
 			return $decompressed;
 		}
 
 		return false;
 	}
 
-	public static function match_domain($host, $reference) {
+	public static function match_domain($host, $reference)
+	{
 		// Check for a direct match
-		if ($host === $reference) {
+		if ($host === $reference)
+		{
 			return true;
 		}
 
@@ -967,10 +1084,12 @@ 
 		// Also validates that the host has 3 parts or more, as per Firefox's
 		// ruleset.
 		$parts = explode('.', $host);
-		if (ip2long($host) === false && count($parts) >= 3) {
+		if (ip2long($host) === false && count($parts) >= 3)
+		{
 			$parts[0] = '*';
 			$wildcard = implode('.', $parts);
-			if ($wildcard === $reference) {
+			if ($wildcard === $reference)
+			{
 				return true;
 			}
 		}

php/Requests/libary/Requests/IDNAEncoder.php

Doc Comments +1 added lines, -1 removed lines

@@ -357,7 +357,7 @@
 	 * @param int $delta
 	 * @param int $numpoints
 	 * @param bool $firsttime
-	 * @return int New bias
+	 * @return double New bias
 	 */
 	protected static function adapt($delta, $numpoints, $firsttime) {
 #	function adapt(delta,numpoints,firsttime):

Braces +88 added lines, -44 removed lines

@@ -10,7 +10,8 @@ 
  * @see https://tools.ietf.org/html/rfc3490 IDNA specification
  * @see https://tools.ietf.org/html/rfc3492 Punycode/Bootstrap specification
  */
-class Requests_IDNAEncoder {
+class Requests_IDNAEncoder
+{
 	/**
 	 * ACE prefix used for IDNA
 	 *
@@ -40,9 +41,11 @@ 
 	 * @param string $string Hostname
 	 * @return string Punycode-encoded hostname
 	 */
-	public static function encode($string) {
+	public static function encode($string)
+	{
 		$parts = explode('.', $string);
-		foreach ($parts as &$part) {
+		foreach ($parts as &$part)
+		{
 			$part = self::to_ascii($part);
 		}
 		return implode('.', $parts);
@@ -59,11 +62,14 @@ 
 	 * @param string $string ASCII or UTF-8 string (max length 64 characters)
 	 * @return string ASCII string
 	 */
-	public static function to_ascii($string) {
+	public static function to_ascii($string)
+	{
 		// Step 1: Check if the string is already ASCII
-		if (self::is_ascii($string)) {
+		if (self::is_ascii($string))
+		{
 			// Skip to step 7
-			if (strlen($string) < 64) {
+			if (strlen($string) < 64)
+			{
 				return $string;
 			}
 
@@ -75,9 +81,11 @@ 
 
 		// Step 3: UseSTD3ASCIIRules is false, continue
 		// Step 4: Check if it's ASCII now
-		if (self::is_ascii($string)) {
+		if (self::is_ascii($string))
+		{
 			// Skip to step 7
-			if (strlen($string) < 64) {
+			if (strlen($string) < 64)
+			{
 				return $string;
 			}
 
@@ -85,7 +93,8 @@ 
 		}
 
 		// Step 5: Check ACE prefix
-		if (strpos($string, self::ACE_PREFIX) === 0) {
+		if (strpos($string, self::ACE_PREFIX) === 0)
+		{
 			throw new Requests_Exception('Provided string begins with ACE prefix', 'idna.provided_is_prefixed', $string);
 		}
 
@@ -96,7 +105,8 @@ 
 		$string = self::ACE_PREFIX . $string;
 
 		// Step 8: Check size
-		if (strlen($string) < 64) {
+		if (strlen($string) < 64)
+		{
 			return $string;
 		}
 
@@ -111,7 +121,8 @@ 
 	 * @param string $string
 	 * @return bool Is the string ASCII-only?
 	 */
-	protected static function is_ascii($string) {
+	protected static function is_ascii($string)
+	{
 		return (preg_match('/(?:[^\x00-\x7F])/', $string) !== 1);
 	}
 
@@ -122,7 +133,8 @@ 
 	 * @param string $string
 	 * @return string Prepared string
 	 */
-	protected static function nameprep($string) {
+	protected static function nameprep($string)
+	{
 		return $string;
 	}
 
@@ -135,53 +147,64 @@ 
 	 * @param string $input
 	 * @return array Unicode code points
 	 */
-	protected static function utf8_to_codepoints($input) {
+	protected static function utf8_to_codepoints($input)
+	{
 		$codepoints = array();
 
 		// Get number of bytes
 		$strlen = strlen($input);
 
-		for ($position = 0; $position < $strlen; $position++) {
+		for ($position = 0; $position < $strlen; $position++)
+		{
 			$value = ord($input[$position]);
 
 			// One byte sequence:
-			if ((~$value & 0x80) === 0x80) {
+			if ((~$value & 0x80) === 0x80)
+			{
 				$character = $value;
 				$length = 1;
 				$remaining = 0;
 			}
 			// Two byte sequence:
-			elseif (($value & 0xE0) === 0xC0) {
+			elseif (($value & 0xE0) === 0xC0)
+			{
 				$character = ($value & 0x1F) << 6;
 				$length = 2;
 				$remaining = 1;
 			}
 			// Three byte sequence:
-			elseif (($value & 0xF0) === 0xE0) {
+			elseif (($value & 0xF0) === 0xE0)
+			{
 				$character = ($value & 0x0F) << 12;
 				$length = 3;
 				$remaining = 2;
 			}
 			// Four byte sequence:
-			elseif (($value & 0xF8) === 0xF0) {
+			elseif (($value & 0xF8) === 0xF0)
+			{
 				$character = ($value & 0x07) << 18;
 				$length = 4;
 				$remaining = 3;
 			}
 			// Invalid byte:
-			else {
+			else
+			{
 				throw new Requests_Exception('Invalid Unicode codepoint', 'idna.invalidcodepoint', $value);
 			}
 
-			if ($remaining > 0) {
-				if ($position + $length > $strlen) {
+			if ($remaining > 0)
+			{
+				if ($position + $length > $strlen)
+				{
 					throw new Requests_Exception('Invalid Unicode codepoint', 'idna.invalidcodepoint', $character);
 				}
-				for ($position++; $remaining > 0; $position++) {
+				for ($position++; $remaining > 0; $position++)
+				{
 					$value = ord($input[$position]);
 
 					// If it is invalid, count the sequence as invalid and reprocess the current byte:
-					if (($value & 0xC0) !== 0x80) {
+					if (($value & 0xC0) !== 0x80)
+					{
 						throw new Requests_Exception('Invalid Unicode codepoint', 'idna.invalidcodepoint', $character);
 					}
 
@@ -225,7 +248,8 @@ 
 	 * @param string $input UTF-8 encoded string to encode
 	 * @return string Punycode-encoded string
 	 */
-	public static function punycode_encode($input) {
+	public static function punycode_encode($input)
+	{
 		$output = '';
 #		let n = initial_n
 		$n = self::BOOTSTRAP_INITIAL_N;
@@ -239,8 +263,10 @@ 
 		$codepoints = self::utf8_to_codepoints($input);
 		$extended = array();
 
-		foreach ($codepoints as $char) {
-			if ($char < 128) {
+		foreach ($codepoints as $char)
+		{
+			if ($char < 128)
+			{
 				// Character is valid ASCII
 				// TODO: this should also check if it's valid for a URL
 				$output .= chr($char);
@@ -249,11 +275,13 @@ 
 			// Check if the character is non-ASCII, but below initial n
 			// This never occurs for Punycode, so ignore in coverage
 			// @codeCoverageIgnoreStart
-			elseif ($char < $n) {
+			elseif ($char < $n)
+			{
 				throw new Requests_Exception('Invalid character', 'idna.character_outside_domain', $char);
 			}
 			// @codeCoverageIgnoreEnd
-			else {
+			else
+			{
 				$extended[$char] = true;
 			}
 		}
@@ -261,12 +289,14 @@ 
 		sort($extended);
 		$b = $h;
 #		[copy them] followed by a delimiter if b > 0
-		if (strlen($output) > 0) {
+		if (strlen($output) > 0)
+		{
 			$output .= '-';
 		}
 #		{if the input contains a non-basic code point < n then fail}
 #		while h < length(input) do begin
-		while ($h < count($codepoints)) {
+		while ($h < count($codepoints))
+		{
 #			let m = the minimum code point >= n in the input
 			$m = array_shift($extended);
 			//printf('next code point to insert is %s' . PHP_EOL, dechex($m));
@@ -275,31 +305,39 @@ 
 #			let n = m
 			$n = $m;
 #			for each code point c in the input (in order) do begin
-			for ($num = 0; $num < count($codepoints); $num++) {
+			for ($num = 0; $num < count($codepoints); $num++)
+			{
 				$c = $codepoints[$num];
 #				if c < n then increment delta, fail on overflow
-				if ($c < $n) {
+				if ($c < $n)
+				{
 					$delta++;
 				}
 #				if c == n then begin
-				elseif ($c === $n) {
+				elseif ($c === $n)
+				{
 #					let q = delta
 					$q = $delta;
 #					for k = base to infinity in steps of base do begin
-					for ($k = self::BOOTSTRAP_BASE; ; $k += self::BOOTSTRAP_BASE) {
+					for ($k = self::BOOTSTRAP_BASE; ; $k += self::BOOTSTRAP_BASE)
+					{
 #						let t = tmin if k <= bias {+ tmin}, or
 #								tmax if k >= bias + tmax, or k - bias otherwise
-						if ($k <= ($bias + self::BOOTSTRAP_TMIN)) {
+						if ($k <= ($bias + self::BOOTSTRAP_TMIN))
+						{
 							$t = self::BOOTSTRAP_TMIN;
 						}
-						elseif ($k >= ($bias + self::BOOTSTRAP_TMAX)) {
+						elseif ($k >= ($bias + self::BOOTSTRAP_TMAX))
+						{
 							$t = self::BOOTSTRAP_TMAX;
 						}
-						else {
+						else
+						{
 							$t = $k - $bias;
 						}
 #						if q < t then break
-						if ($q < $t) {
+						if ($q < $t)
+						{
 							break;
 						}
 #						output the code point for digit t + ((q - t) mod (base - t))
@@ -339,10 +377,12 @@ 
 	 * @param int $digit Digit in the range 0-35
 	 * @return string Single character corresponding to digit
 	 */
-	protected static function digit_to_char($digit) {
+	protected static function digit_to_char($digit)
+	{
 		// @codeCoverageIgnoreStart
 		// As far as I know, this never happens, but still good to be sure.
-		if ($digit < 0 || $digit > 35) {
+		if ($digit < 0 || $digit > 35)
+		{
 			throw new Requests_Exception(sprintf('Invalid digit %d', $digit), 'idna.invalid_digit', $digit);
 		}
 		// @codeCoverageIgnoreEnd
@@ -359,14 +399,17 @@ 
 	 * @param bool $firsttime
 	 * @return int New bias
 	 */
-	protected static function adapt($delta, $numpoints, $firsttime) {
+	protected static function adapt($delta, $numpoints, $firsttime)
+	{
 #	function adapt(delta,numpoints,firsttime):
 #		if firsttime then let delta = delta div damp
-		if ($firsttime) {
+		if ($firsttime)
+		{
 			$delta = floor($delta / self::BOOTSTRAP_DAMP);
 		}
 #		else let delta = delta div 2
-		else {
+		else
+		{
 			$delta = floor($delta / 2);
 		}
 #		let delta = delta + (delta div numpoints)
@@ -375,7 +418,8 @@ 
 		$k = 0;
 #		while delta > ((base - tmin) * tmax) div 2 do begin
 		$max = floor(((self::BOOTSTRAP_BASE - self::BOOTSTRAP_TMIN) * self::BOOTSTRAP_TMAX) / 2);
-		while ($delta > $max) {
+		while ($delta > $max)
+		{
 #			let delta = delta div (base - tmin)
 			$delta = floor($delta / (self::BOOTSTRAP_BASE - self::BOOTSTRAP_TMIN));
 #			let k = k + base

php/Requests/libary/Requests/IRI.php

Doc Comments +2 added lines, -1 removed lines

@@ -249,7 +249,7 @@ 
 	 *
 	 * Returns false if $base is not absolute, otherwise an IRI.
 	 *
-	 * @param IRI|string $base (Absolute) Base IRI
+	 * @param string $base (Absolute) Base IRI
 	 * @param IRI|string $relative Relative IRI
 	 * @return IRI|false
 	 */
@@ -984,6 +984,7 @@ 
 	 * Convert an IRI to a URI (or parts thereof)
 	 *
 	 * @param string|bool IRI to convert (or false from {@see get_iri})
+	 * @param false|string $string
 	 * @return string|false URI if IRI is valid, false otherwise.
 	 */
 	protected function to_uri($string) {

Braces +304 added lines, -152 removed lines

@@ -63,7 +63,8 @@ 
  * @property string $fragment Fragment, formatted for a URI (after '#')
  * @property string $ifragment Fragment part of the IRI (after '#')
  */
-class Requests_IRI {
+class Requests_IRI
+{
 	/**
 	 * Scheme
 	 *
@@ -142,7 +143,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function __toString() {
+	public function __toString()
+	{
 		return $this->get_iri();
 	}
 
@@ -152,8 +154,10 @@ 
 	 * @param string $name Property name
 	 * @param mixed $value Property value
 	 */
-	public function __set($name, $value) {
-		if (method_exists($this, 'set_' . $name)) {
+	public function __set($name, $value)
+	{
+		if (method_exists($this, 'set_' . $name))
+		{
 			call_user_func(array($this, 'set_' . $name), $value);
 		}
 		elseif (
@@ -174,7 +178,8 @@ 
 	 * @param string $name Property name
 	 * @return mixed
 	 */
-	public function __get($name) {
+	public function __get($name)
+	{
 		// isset() returns false for null, we don't want to do that
 		// Also why we use array_key_exists below instead of isset()
 		$props = get_object_vars($this);
@@ -188,28 +193,34 @@ 
 			$method = 'get_' . $name;
 			$return = $this->$method();
 		}
-		elseif (array_key_exists($name, $props)) {
+		elseif (array_key_exists($name, $props))
+		{
 			$return = $this->$name;
 		}
 		// host -> ihost
-		elseif (($prop = 'i' . $name) && array_key_exists($prop, $props)) {
+		elseif (($prop = 'i' . $name) && array_key_exists($prop, $props))
+		{
 			$name = $prop;
 			$return = $this->$prop;
 		}
 		// ischeme -> scheme
-		elseif (($prop = substr($name, 1)) && array_key_exists($prop, $props)) {
+		elseif (($prop = substr($name, 1)) && array_key_exists($prop, $props))
+		{
 			$name = $prop;
 			$return = $this->$prop;
 		}
-		else {
+		else
+		{
 			trigger_error('Undefined property: ' . get_class($this) . '::' . $name, E_USER_NOTICE);
 			$return = null;
 		}
 
-		if ($return === null && isset($this->normalization[$this->scheme][$name])) {
+		if ($return === null && isset($this->normalization[$this->scheme][$name]))
+		{
 			return $this->normalization[$this->scheme][$name];
 		}
-		else {
+		else
+		{
 			return $return;
 		}
 	}
@@ -220,7 +231,8 @@ 
 	 * @param string $name Property name
 	 * @return bool
 	 */
-	public function __isset($name) {
+	public function __isset($name)
+	{
 		return (method_exists($this, 'get_' . $name) || isset($this->$name));
 	}
 
@@ -229,8 +241,10 @@ 
 	 *
 	 * @param string $name Property name
 	 */
-	public function __unset($name) {
-		if (method_exists($this, 'set_' . $name)) {
+	public function __unset($name)
+	{
+		if (method_exists($this, 'set_' . $name))
+		{
 			call_user_func(array($this, 'set_' . $name), '');
 		}
 	}
@@ -240,7 +254,8 @@ 
 	 *
 	 * @param string|null $iri
 	 */
-	public function __construct($iri = null) {
+	public function __construct($iri = null)
+	{
 		$this->set_iri($iri);
 	}
 
@@ -253,64 +268,82 @@ 
 	 * @param IRI|string $relative Relative IRI
 	 * @return IRI|false
 	 */
-	public static function absolutize($base, $relative) {
-		if (!($relative instanceof Requests_IRI)) {
+	public static function absolutize($base, $relative)
+	{
+		if (!($relative instanceof Requests_IRI))
+		{
 			$relative = new Requests_IRI($relative);
 		}
-		if (!$relative->is_valid()) {
+		if (!$relative->is_valid())
+		{
 			return false;
 		}
-		elseif ($relative->scheme !== null) {
+		elseif ($relative->scheme !== null)
+		{
 			return clone $relative;
 		}
 
-		if (!($base instanceof Requests_IRI)) {
+		if (!($base instanceof Requests_IRI))
+		{
 			$base = new Requests_IRI($base);
 		}
-		if ($base->scheme === null || !$base->is_valid()) {
+		if ($base->scheme === null || !$base->is_valid())
+		{
 			return false;
 		}
 
-		if ($relative->get_iri() !== '') {
-			if ($relative->iuserinfo !== null || $relative->ihost !== null || $relative->port !== null) {
+		if ($relative->get_iri() !== '')
+		{
+			if ($relative->iuserinfo !== null || $relative->ihost !== null || $relative->port !== null)
+			{
 				$target = clone $relative;
 				$target->scheme = $base->scheme;
 			}
-			else {
+			else
+			{
 				$target = new Requests_IRI;
 				$target->scheme = $base->scheme;
 				$target->iuserinfo = $base->iuserinfo;
 				$target->ihost = $base->ihost;
 				$target->port = $base->port;
-				if ($relative->ipath !== '') {
-					if ($relative->ipath[0] === '/') {
+				if ($relative->ipath !== '')
+				{
+					if ($relative->ipath[0] === '/')
+					{
 						$target->ipath = $relative->ipath;
 					}
-					elseif (($base->iuserinfo !== null || $base->ihost !== null || $base->port !== null) && $base->ipath === '') {
+					elseif (($base->iuserinfo !== null || $base->ihost !== null || $base->port !== null) && $base->ipath === '')
+					{
 						$target->ipath = '/' . $relative->ipath;
 					}
-					elseif (($last_segment = strrpos($base->ipath, '/')) !== false) {
+					elseif (($last_segment = strrpos($base->ipath, '/')) !== false)
+					{
 						$target->ipath = substr($base->ipath, 0, $last_segment + 1) . $relative->ipath;
 					}
-					else {
+					else
+					{
 						$target->ipath = $relative->ipath;
 					}
 					$target->ipath = $target->remove_dot_segments($target->ipath);
 					$target->iquery = $relative->iquery;
 				}
-				else {
+				else
+				{
 					$target->ipath = $base->ipath;
-					if ($relative->iquery !== null) {
+					if ($relative->iquery !== null)
+					{
 						$target->iquery = $relative->iquery;
 					}
-					elseif ($base->iquery !== null) {
+					elseif ($base->iquery !== null)
+					{
 						$target->iquery = $base->iquery;
 					}
 				}
 				$target->ifragment = $relative->ifragment;
 			}
 		}
-		else {
+		else
+		{
 			$target = clone $base;
 			$target->ifragment = null;
 		}
@@ -324,26 +357,33 @@ 
 	 * @param string $iri
 	 * @return array
 	 */
-	protected function parse_iri($iri) {
+	protected function parse_iri($iri)
+	{
 		$iri = trim($iri, "\x20\x09\x0A\x0C\x0D");
 		$has_match = preg_match('/^((?P<scheme>[^:\/?#]+):)?(\/\/(?P<authority>[^\/?#]*))?(?P<path>[^?#]*)(\?(?P<query>[^#]*))?(#(?P<fragment>.*))?$/', $iri, $match);
-		if (!$has_match) {
+		if (!$has_match)
+		{
 			throw new Requests_Exception('Cannot parse supplied IRI', 'iri.cannot_parse', $iri);
 		}
 
-		if ($match[1] === '') {
+		if ($match[1] === '')
+		{
 			$match['scheme'] = null;
 		}
-		if (!isset($match[3]) || $match[3] === '') {
+		if (!isset($match[3]) || $match[3] === '')
+		{
 			$match['authority'] = null;
 		}
-		if (!isset($match[5])) {
+		if (!isset($match[5]))
+		{
 			$match['path'] = '';
 		}
-		if (!isset($match[6]) || $match[6] === '') {
+		if (!isset($match[6]) || $match[6] === '')
+		{
 			$match['query'] = null;
 		}
-		if (!isset($match[8]) || $match[8] === '') {
+		if (!isset($match[8]) || $match[8] === '')
+		{
 			$match['fragment'] = null;
 		}
 		return $match;
@@ -355,52 +395,63 @@ 
 	 * @param string $input
 	 * @return string
 	 */
-	protected function remove_dot_segments($input) {
+	protected function remove_dot_segments($input)
+	{
 		$output = '';
-		while (strpos($input, './') !== false || strpos($input, '/.') !== false || $input === '.' || $input === '..') {
+		while (strpos($input, './') !== false || strpos($input, '/.') !== false || $input === '.' || $input === '..')
+		{
 			// A: If the input buffer begins with a prefix of "../" or "./",
 			// then remove that prefix from the input buffer; otherwise,
-			if (strpos($input, '../') === 0) {
+			if (strpos($input, '../') === 0)
+			{
 				$input = substr($input, 3);
 			}
-			elseif (strpos($input, './') === 0) {
+			elseif (strpos($input, './') === 0)
+			{
 				$input = substr($input, 2);
 			}
 			// B: if the input buffer begins with a prefix of "/./" or "/.",
 			// where "." is a complete path segment, then replace that prefix
 			// with "/" in the input buffer; otherwise,
-			elseif (strpos($input, '/./') === 0) {
+			elseif (strpos($input, '/./') === 0)
+			{
 				$input = substr($input, 2);
 			}
-			elseif ($input === '/.') {
+			elseif ($input === '/.')
+			{
 				$input = '/';
 			}
 			// C: if the input buffer begins with a prefix of "/../" or "/..",
 			// where ".." is a complete path segment, then replace that prefix
 			// with "/" in the input buffer and remove the last segment and its
 			// preceding "/" (if any) from the output buffer; otherwise,
-			elseif (strpos($input, '/../') === 0) {
+			elseif (strpos($input, '/../') === 0)
+			{
 				$input = substr($input, 3);
 				$output = substr_replace($output, '', strrpos($output, '/'));
 			}
-			elseif ($input === '/..') {
+			elseif ($input === '/..')
+			{
 				$input = '/';
 				$output = substr_replace($output, '', strrpos($output, '/'));
 			}
 			// D: if the input buffer consists only of "." or "..", then remove
 			// that from the input buffer; otherwise,
-			elseif ($input === '.' || $input === '..') {
+			elseif ($input === '.' || $input === '..')
+			{
 				$input = '';
 			}
 			// E: move the first path segment in the input buffer to the end of
 			// the output buffer, including the initial "/" character (if any)
 			// and any subsequent characters up to, but not including, the next
 			// "/" character or the end of the input buffer
-			elseif (($pos = strpos($input, '/', 1)) !== false) {
+			elseif (($pos = strpos($input, '/', 1)) !== false)
+			{
 				$output .= substr($input, 0, $pos);
 				$input = substr_replace($input, '', 0, $pos);
 			}
-			else {
+			else
+			{
 				$output .= $input;
 				$input = '';
 			}
@@ -417,7 +468,8 @@ 
 	 * @param bool $iprivate Allow iprivate
 	 * @return string
 	 */
-	protected function replace_invalid_with_pct_encoding($string, $extra_chars, $iprivate = false) {
+	protected function replace_invalid_with_pct_encoding($string, $extra_chars, $iprivate = false)
+	{
 		// Normalize as many pct-encoded sections as possible
 		$string = preg_replace_callback('/(?:%[A-Fa-f0-9]{2})+/', array(&$this, 'remove_iunreserved_percent_encoded'), $string);
 
@@ -431,7 +483,8 @@ 
 		// Now replace any bytes that aren't allowed with their pct-encoded versions
 		$position = 0;
 		$strlen = strlen($string);
-		while (($position += strspn($string, $extra_chars, $position)) < $strlen) {
+		while (($position += strspn($string, $extra_chars, $position)) < $strlen)
+		{
 			$value = ord($string[$position]);
 
 			// Start position
@@ -442,48 +495,58 @@ 
 
 			// No one byte sequences are valid due to the while.
 			// Two byte sequence:
-			if (($value & 0xE0) === 0xC0) {
+			if (($value & 0xE0) === 0xC0)
+			{
 				$character = ($value & 0x1F) << 6;
 				$length = 2;
 				$remaining = 1;
 			}
 			// Three byte sequence:
-			elseif (($value & 0xF0) === 0xE0) {
+			elseif (($value & 0xF0) === 0xE0)
+			{
 				$character = ($value & 0x0F) << 12;
 				$length = 3;
 				$remaining = 2;
 			}
 			// Four byte sequence:
-			elseif (($value & 0xF8) === 0xF0) {
+			elseif (($value & 0xF8) === 0xF0)
+			{
 				$character = ($value & 0x07) << 18;
 				$length = 4;
 				$remaining = 3;
 			}
 			// Invalid byte:
-			else {
+			else
+			{
 				$valid = false;
 				$length = 1;
 				$remaining = 0;
 			}
 
-			if ($remaining) {
-				if ($position + $length <= $strlen) {
-					for ($position++; $remaining; $position++) {
+			if ($remaining)
+			{
+				if ($position + $length <= $strlen)
+				{
+					for ($position++; $remaining; $position++)
+					{
 						$value = ord($string[$position]);
 
 						// Check that the byte is valid, then add it to the character:
-						if (($value & 0xC0) === 0x80) {
+						if (($value & 0xC0) === 0x80)
+						{
 							$character |= ($value & 0x3F) << (--$remaining * 6);
 						}
 						// If it is invalid, count the sequence as invalid and reprocess the current byte:
-						else {
+						else
+						{
 							$valid = false;
 							$position--;
 							break;
 						}
 					}
 				}
-				else {
+				else
+				{
 					$position = $strlen - 1;
 					$valid = false;
 				}
@@ -515,11 +578,13 @@ 
 				)
 			) {
 				// If we were a character, pretend we weren't, but rather an error.
-				if ($valid) {
+				if ($valid)
+				{
 					$position--;
 				}
 
-				for ($j = $start; $j <= $position; $j++) {
+				for ($j = $start; $j <= $position; $j++)
+				{
 					$string = substr_replace($string, sprintf('%%%02X', ord($string[$j])), $j, 1);
 					$j += 2;
 					$position += 2;
@@ -540,7 +605,8 @@ 
 	 * @param array $match PCRE match
 	 * @return string Replacement
 	 */
-	protected function remove_iunreserved_percent_encoded($match) {
+	protected function remove_iunreserved_percent_encoded($match)
+	{
 		// As we just have valid percent encoded sequences we can just explode
 		// and ignore the first member of the returned array (an empty string).
 		$bytes = explode('%', $match[0]);
@@ -552,11 +618,13 @@ 
 		$remaining = 0;
 
 		// Loop over each and every byte, and set $value to its value
-		for ($i = 1, $len = count($bytes); $i < $len; $i++) {
+		for ($i = 1, $len = count($bytes); $i < $len; $i++)
+		{
 			$value = hexdec($bytes[$i]);
 
 			// If we're the first byte of sequence:
-			if (!$remaining) {
+			if (!$remaining)
+			{
 				// Start position
 				$start = $i;
 
@@ -564,43 +632,51 @@ 
 				$valid = true;
 
 				// One byte sequence:
-				if ($value <= 0x7F) {
+				if ($value <= 0x7F)
+				{
 					$character = $value;
 					$length = 1;
 				}
 				// Two byte sequence:
-				elseif (($value & 0xE0) === 0xC0) {
+				elseif (($value & 0xE0) === 0xC0)
+				{
 					$character = ($value & 0x1F) << 6;
 					$length = 2;
 					$remaining = 1;
 				}
 				// Three byte sequence:
-				elseif (($value & 0xF0) === 0xE0) {
+				elseif (($value & 0xF0) === 0xE0)
+				{
 					$character = ($value & 0x0F) << 12;
 					$length = 3;
 					$remaining = 2;
 				}
 				// Four byte sequence:
-				elseif (($value & 0xF8) === 0xF0) {
+				elseif (($value & 0xF8) === 0xF0)
+				{
 					$character = ($value & 0x07) << 18;
 					$length = 4;
 					$remaining = 3;
 				}
 				// Invalid byte:
-				else {
+				else
+				{
 					$valid = false;
 					$remaining = 0;
 				}
 			}
 			// Continuation byte:
-			else {
+			else
+			{
 				// Check that the byte is valid, then add it to the character:
-				if (($value & 0xC0) === 0x80) {
+				if (($value & 0xC0) === 0x80)
+				{
 					$remaining--;
 					$character |= ($value & 0x3F) << ($remaining * 6);
 				}
 				// If it is invalid, count the sequence as invalid and reprocess the current byte as the start of a sequence:
-				else {
+				else
+				{
 					$valid = false;
 					$remaining = 0;
 					$i--;
@@ -608,7 +684,8 @@ 
 			}
 
 			// If we've reached the end of the current byte sequence, append it to Unicode::$data
-			if (!$remaining) {
+			if (!$remaining)
+			{
 				// Percent encode anything invalid or not in iunreserved
 				if (
 					// Invalid sequences
@@ -631,12 +708,15 @@ 
 					|| $character > 0x7E && $character < 0xA0
 					|| $character > 0xD7FF && $character < 0xF900
 				) {
-					for ($j = $start; $j <= $i; $j++) {
+					for ($j = $start; $j <= $i; $j++)
+					{
 						$string .= '%' . strtoupper($bytes[$j]);
 					}
 				}
-				else {
-					for ($j = $start; $j <= $i; $j++) {
+				else
+				{
+					for ($j = $start; $j <= $i; $j++)
+					{
 						$string .= chr(hexdec($bytes[$j]));
 					}
 				}
@@ -645,8 +725,10 @@ 
 
 		// If we have any bytes left over they are invalid (i.e., we are
 		// mid-way through a multi-byte sequence)
-		if ($remaining) {
-			for ($j = $start; $j < $len; $j++) {
+		if ($remaining)
+		{
+			for ($j = $start; $j < $len; $j++)
+			{
 				$string .= '%' . strtoupper($bytes[$j]);
 			}
 		}
@@ -654,26 +736,34 @@ 
 		return $string;
 	}
 
-	protected function scheme_normalization() {
-		if (isset($this->normalization[$this->scheme]['iuserinfo']) && $this->iuserinfo === $this->normalization[$this->scheme]['iuserinfo']) {
+	protected function scheme_normalization()
+	{
+		if (isset($this->normalization[$this->scheme]['iuserinfo']) && $this->iuserinfo === $this->normalization[$this->scheme]['iuserinfo'])
+		{
 			$this->iuserinfo = null;
 		}
-		if (isset($this->normalization[$this->scheme]['ihost']) && $this->ihost === $this->normalization[$this->scheme]['ihost']) {
+		if (isset($this->normalization[$this->scheme]['ihost']) && $this->ihost === $this->normalization[$this->scheme]['ihost'])
+		{
 			$this->ihost = null;
 		}
-		if (isset($this->normalization[$this->scheme]['port']) && $this->port === $this->normalization[$this->scheme]['port']) {
+		if (isset($this->normalization[$this->scheme]['port']) && $this->port === $this->normalization[$this->scheme]['port'])
+		{
 			$this->port = null;
 		}
-		if (isset($this->normalization[$this->scheme]['ipath']) && $this->ipath === $this->normalization[$this->scheme]['ipath']) {
+		if (isset($this->normalization[$this->scheme]['ipath']) && $this->ipath === $this->normalization[$this->scheme]['ipath'])
+		{
 			$this->ipath = '';
 		}
-		if (isset($this->ihost) && empty($this->ipath)) {
+		if (isset($this->ihost) && empty($this->ipath))
+		{
 			$this->ipath = '/';
 		}
-		if (isset($this->normalization[$this->scheme]['iquery']) && $this->iquery === $this->normalization[$this->scheme]['iquery']) {
+		if (isset($this->normalization[$this->scheme]['iquery']) && $this->iquery === $this->normalization[$this->scheme]['iquery'])
+		{
 			$this->iquery = null;
 		}
-		if (isset($this->normalization[$this->scheme]['ifragment']) && $this->ifragment === $this->normalization[$this->scheme]['ifragment']) {
+		if (isset($this->normalization[$this->scheme]['ifragment']) && $this->ifragment === $this->normalization[$this->scheme]['ifragment'])
+		{
 			$this->ifragment = null;
 		}
 	}
@@ -684,7 +774,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function is_valid() {
+	public function is_valid()
+	{
 		$isauthority = $this->iuserinfo !== null || $this->ihost !== null || $this->port !== null;
 		if ($this->ipath !== '' &&
 			(
@@ -710,16 +801,20 @@ 
 	 * @param string $iri
 	 * @return bool
 	 */
-	protected function set_iri($iri) {
+	protected function set_iri($iri)
+	{
 		static $cache;
-		if (!$cache) {
+		if (!$cache)
+		{
 			$cache = array();
 		}
 
-		if ($iri === null) {
+		if ($iri === null)
+		{
 			return true;
 		}
-		if (isset($cache[$iri])) {
+		if (isset($cache[$iri]))
+		{
 			list($this->scheme,
 				 $this->iuserinfo,
 				 $this->ihost,
@@ -757,15 +852,19 @@ 
 	 * @param string $scheme
 	 * @return bool
 	 */
-	protected function set_scheme($scheme) {
-		if ($scheme === null) {
+	protected function set_scheme($scheme)
+	{
+		if ($scheme === null)
+		{
 			$this->scheme = null;
 		}
-		elseif (!preg_match('/^[A-Za-z][0-9A-Za-z+\-.]*$/', $scheme)) {
+		elseif (!preg_match('/^[A-Za-z][0-9A-Za-z+\-.]*$/', $scheme))
+		{
 			$this->scheme = null;
 			return false;
 		}
-		else {
+		else
+		{
 			$this->scheme = strtolower($scheme);
 		}
 		return true;
@@ -778,19 +877,23 @@ 
 	 * @param string $authority
 	 * @return bool
 	 */
-	protected function set_authority($authority) {
+	protected function set_authority($authority)
+	{
 		static $cache;
-		if (!$cache) {
+		if (!$cache)
+		{
 			$cache = array();
 		}
 
-		if ($authority === null) {
+		if ($authority === null)
+		{
 			$this->iuserinfo = null;
 			$this->ihost = null;
 			$this->port = null;
 			return true;
 		}
-		if (isset($cache[$authority])) {
+		if (isset($cache[$authority]))
+		{
 			list($this->iuserinfo,
 				 $this->ihost,
 				 $this->port,
@@ -800,21 +903,26 @@ 
 		}
 
 		$remaining = $authority;
-		if (($iuserinfo_end = strrpos($remaining, '@')) !== false) {
+		if (($iuserinfo_end = strrpos($remaining, '@')) !== false)
+		{
 			$iuserinfo = substr($remaining, 0, $iuserinfo_end);
 			$remaining = substr($remaining, $iuserinfo_end + 1);
 		}
-		else {
+		else
+		{
 			$iuserinfo = null;
 		}
-		if (($port_start = strpos($remaining, ':', strpos($remaining, ']'))) !== false) {
+		if (($port_start = strpos($remaining, ':', strpos($remaining, ']'))) !== false)
+		{
 			$port = substr($remaining, $port_start + 1);
-			if ($port === false || $port === '') {
+			if ($port === false || $port === '')
+			{
 				$port = null;
 			}
 			$remaining = substr($remaining, 0, $port_start);
 		}
-		else {
+		else
+		{
 			$port = null;
 		}
 
@@ -836,11 +944,14 @@ 
 	 * @param string $iuserinfo
 	 * @return bool
 	 */
-	protected function set_userinfo($iuserinfo) {
-		if ($iuserinfo === null) {
+	protected function set_userinfo($iuserinfo)
+	{
+		if ($iuserinfo === null)
+		{
 			$this->iuserinfo = null;
 		}
-		else {
+		else
+		{
 			$this->iuserinfo = $this->replace_invalid_with_pct_encoding($iuserinfo, '!$&\'()*+,;=:');
 			$this->scheme_normalization();
 		}
@@ -855,21 +966,27 @@ 
 	 * @param string $ihost
 	 * @return bool
 	 */
-	protected function set_host($ihost) {
-		if ($ihost === null) {
+	protected function set_host($ihost)
+	{
+		if ($ihost === null)
+		{
 			$this->ihost = null;
 			return true;
 		}
-		if (substr($ihost, 0, 1) === '[' && substr($ihost, -1) === ']') {
-			if (Requests_IPv6::check_ipv6(substr($ihost, 1, -1))) {
+		if (substr($ihost, 0, 1) === '[' && substr($ihost, -1) === ']')
+		{
+			if (Requests_IPv6::check_ipv6(substr($ihost, 1, -1)))
+			{
 				$this->ihost = '[' . Requests_IPv6::compress(substr($ihost, 1, -1)) . ']';
 			}
-			else {
+			else
+			{
 				$this->ihost = null;
 				return false;
 			}
 		}
-		else {
+		else
+		{
 			$ihost = $this->replace_invalid_with_pct_encoding($ihost, '!$&\'()*+,;=');
 
 			// Lowercase, but ignore pct-encoded sections (as they should
@@ -877,11 +994,14 @@ 
 			// as that can add unescaped characters.
 			$position = 0;
 			$strlen = strlen($ihost);
-			while (($position += strcspn($ihost, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ%', $position)) < $strlen) {
-				if ($ihost[$position] === '%') {
+			while (($position += strcspn($ihost, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ%', $position)) < $strlen)
+			{
+				if ($ihost[$position] === '%')
+				{
 					$position += 3;
 				}
-				else {
+				else
+				{
 					$ihost[$position] = strtolower($ihost[$position]);
 					$position++;
 				}
@@ -902,13 +1022,16 @@ 
 	 * @param string $port
 	 * @return bool
 	 */
-	protected function set_port($port) {
-		if ($port === null) {
+	protected function set_port($port)
+	{
+		if ($port === null)
+		{
 			$this->port = null;
 			return true;
 		}
 
-		if (strspn($port, '0123456789') === strlen($port)) {
+		if (strspn($port, '0123456789') === strlen($port))
+		{
 			$this->port = (int) $port;
 			$this->scheme_normalization();
 			return true;
@@ -924,18 +1047,22 @@ 
 	 * @param string $ipath
 	 * @return bool
 	 */
-	protected function set_path($ipath) {
+	protected function set_path($ipath)
+	{
 		static $cache;
-		if (!$cache) {
+		if (!$cache)
+		{
 			$cache = array();
 		}
 
 		$ipath = (string) $ipath;
 
-		if (isset($cache[$ipath])) {
+		if (isset($cache[$ipath]))
+		{
 			$this->ipath = $cache[$ipath][(int) ($this->scheme !== null)];
 		}
-		else {
+		else
+		{
 			$valid = $this->replace_invalid_with_pct_encoding($ipath, '!$&\'()*+,;=@:/');
 			$removed = $this->remove_dot_segments($valid);
 
@@ -952,11 +1079,14 @@ 
 	 * @param string $iquery
 	 * @return bool
 	 */
-	protected function set_query($iquery) {
-		if ($iquery === null) {
+	protected function set_query($iquery)
+	{
+		if ($iquery === null)
+		{
 			$this->iquery = null;
 		}
-		else {
+		else
+		{
 			$this->iquery = $this->replace_invalid_with_pct_encoding($iquery, '!$&\'()*+,;=:@/?', true);
 			$this->scheme_normalization();
 		}
@@ -969,11 +1099,14 @@ 
 	 * @param string $ifragment
 	 * @return bool
 	 */
-	protected function set_fragment($ifragment) {
-		if ($ifragment === null) {
+	protected function set_fragment($ifragment)
+	{
+		if ($ifragment === null)
+		{
 			$this->ifragment = null;
 		}
-		else {
+		else
+		{
 			$this->ifragment = $this->replace_invalid_with_pct_encoding($ifragment, '!$&\'()*+,;=:@/?');
 			$this->scheme_normalization();
 		}
@@ -986,19 +1119,23 @@ 
 	 * @param string|bool IRI to convert (or false from {@see get_iri})
 	 * @return string|false URI if IRI is valid, false otherwise.
 	 */
-	protected function to_uri($string) {
-		if (!is_string($string)) {
+	protected function to_uri($string)
+	{
+		if (!is_string($string))
+		{
 			return false;
 		}
 
 		static $non_ascii;
-		if (!$non_ascii) {
+		if (!$non_ascii)
+		{
 			$non_ascii = implode('', range("\x80", "\xFF"));
 		}
 
 		$position = 0;
 		$strlen = strlen($string);
-		while (($position += strcspn($string, $non_ascii, $position)) < $strlen) {
+		while (($position += strcspn($string, $non_ascii, $position)) < $strlen)
+		{
 			$string = substr_replace($string, sprintf('%%%02X', ord($string[$position])), $position, 1);
 			$position += 3;
 			$strlen += 2;
@@ -1012,23 +1149,29 @@ 
 	 *
 	 * @return string
 	 */
-	protected function get_iri() {
-		if (!$this->is_valid()) {
+	protected function get_iri()
+	{
+		if (!$this->is_valid())
+		{
 			return false;
 		}
 
 		$iri = '';
-		if ($this->scheme !== null) {
+		if ($this->scheme !== null)
+		{
 			$iri .= $this->scheme . ':';
 		}
-		if (($iauthority = $this->get_iauthority()) !== null) {
+		if (($iauthority = $this->get_iauthority()) !== null)
+		{
 			$iri .= '//' . $iauthority;
 		}
 		$iri .= $this->ipath;
-		if ($this->iquery !== null) {
+		if ($this->iquery !== null)
+		{
 			$iri .= '?' . $this->iquery;
 		}
-		if ($this->ifragment !== null) {
+		if ($this->ifragment !== null)
+		{
 			$iri .= '#' . $this->ifragment;
 		}
 
@@ -1040,7 +1183,8 @@ 
 	 *
 	 * @return string
 	 */
-	protected function get_uri() {
+	protected function get_uri()
+	{
 		return $this->to_uri($this->get_iri());
 	}
 
@@ -1049,19 +1193,24 @@ 
 	 *
 	 * @return string
 	 */
-	protected function get_iauthority() {
-		if ($this->iuserinfo === null && $this->ihost === null && $this->port === null) {
+	protected function get_iauthority()
+	{
+		if ($this->iuserinfo === null && $this->ihost === null && $this->port === null)
+		{
 			return null;
 		}
 
 		$iauthority = '';
-		if ($this->iuserinfo !== null) {
+		if ($this->iuserinfo !== null)
+		{
 			$iauthority .= $this->iuserinfo . '@';
 		}
-		if ($this->ihost !== null) {
+		if ($this->ihost !== null)
+		{
 			$iauthority .= $this->ihost;
 		}
-		if ($this->port !== null) {
+		if ($this->port !== null)
+		{
 			$iauthority .= ':' . $this->port;
 		}
 		return $iauthority;
@@ -1072,12 +1221,15 @@ 
 	 *
 	 * @return string
 	 */
-	protected function get_authority() {
+	protected function get_authority()
+	{
 		$iauthority = $this->get_iauthority();
-		if (is_string($iauthority)) {
+		if (is_string($iauthority))
+		{
 			return $this->to_uri($iauthority);
 		}
-		else {
+		else
+		{
 			return $iauthority;
 		}
 	}

php/Requests/libary/Requests/Session.php

Doc Comments +1 added lines, -1 removed lines

@@ -232,7 +232,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 ($this->url !== null) {

Braces +50 added lines, -25 removed lines

@@ -17,7 +17,8 @@ 
  * @package Requests
  * @subpackage Session Handler
  */
-class Requests_Session {
+class Requests_Session
+{
 	/**
 	 * Base URL for requests
 	 *
@@ -63,13 +64,15 @@ 
 	 * @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();
 		}
 	}
@@ -80,8 +83,10 @@ 
 	 * @param string $key Property key
 	 * @return mixed|null Property value, null if none found
 	 */
-	public function __get($key) {
-		if (isset($this->options[$key])) {
+	public function __get($key)
+	{
+		if (isset($this->options[$key]))
+		{
 			return $this->options[$key];
 		}
 
@@ -94,7 +99,8 @@ 
 	 * @param string $key Property key
 	 * @param mixed $value Property value
 	 */
-	public function __set($key, $value) {
+	public function __set($key, $value)
+	{
 		$this->options[$key] = $value;
 	}
 
@@ -103,7 +109,8 @@ 
 	 *
 	 * @param string $key Property key
 	 */
-	public function __isset($key) {
+	public function __isset($key)
+	{
 		return isset($this->options[$key]);
 	}
 
@@ -112,8 +119,10 @@ 
 	 *
 	 * @param string $key Property key
 	 */
-	public function __unset($key) {
-		if (isset($this->options[$key])) {
+	public function __unset($key)
+	{
+		if (isset($this->options[$key]))
+		{
 			unset($this->options[$key]);
 		}
 	}
@@ -128,21 +137,24 @@ 
 	/**
 	 * Send a GET request
 	 */
-	public function get($url, $headers = array(), $options = array()) {
+	public function get($url, $headers = array(), $options = array())
+	{
 		return $this->request($url, $headers, null, Requests::GET, $options);
 	}
 
 	/**
 	 * Send a HEAD request
 	 */
-	public function head($url, $headers = array(), $options = array()) {
+	public function head($url, $headers = array(), $options = array())
+	{
 		return $this->request($url, $headers, null, Requests::HEAD, $options);
 	}
 
 	/**
 	 * Send a DELETE request
 	 */
-	public function delete($url, $headers = array(), $options = array()) {
+	public function delete($url, $headers = array(), $options = array())
+	{
 		return $this->request($url, $headers, null, Requests::DELETE, $options);
 	}
 	/**#@-*/
@@ -158,14 +170,16 @@ 
 	/**
 	 * Send a POST request
 	 */
-	public function post($url, $headers = array(), $data = array(), $options = array()) {
+	public function post($url, $headers = array(), $data = array(), $options = array())
+	{
 		return $this->request($url, $headers, $data, Requests::POST, $options);
 	}
 
 	/**
 	 * Send a PUT request
 	 */
-	public function put($url, $headers = array(), $data = array(), $options = array()) {
+	public function put($url, $headers = array(), $data = array(), $options = array())
+	{
 		return $this->request($url, $headers, $data, Requests::PUT, $options);
 	}
 
@@ -177,7 +191,8 @@ 
 	 *
 	 * @link https://tools.ietf.org/html/rfc5789
 	 */
-	public function patch($url, $headers, $data = array(), $options = array()) {
+	public function patch($url, $headers, $data = array(), $options = array())
+	{
 		return $this->request($url, $headers, $data, Requests::PATCH, $options);
 	}
 	/**#@-*/
@@ -199,7 +214,8 @@ 
 	 * @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()) {
+	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']);
@@ -214,8 +230,10 @@ 
 	 * @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) {
+	public function request_multiple($requests, $options = array())
+	{
+		foreach ($requests as $key => $request)
+		{
 			$requests[$key] = $this->merge_request($request, false);
 		}
 
@@ -234,27 +252,34 @@ 
 	 * @param boolean $merge_options Should we merge options as well?
 	 * @return array Request data
 	 */
-	protected function merge_request($request, $merge_options = true) {
-		if ($this->url !== null) {
+	protected function merge_request($request, $merge_options = true)
+	{
+		if ($this->url !== null)
+		{
 			$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']);
 
-		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)) {
+		elseif (is_array($request['data']) && is_array($this->data))
+		{
 			$request['data'] = array_merge($this->data, $request['data']);
 		}
 
-		if ($merge_options !== false) {
+		if ($merge_options !== false)
+		{
 			$request['options'] = array_merge($this->options, $request['options']);
 
 			// Disallow forcing the type, as that's a per request setting

php/Requests/libary/Requests/Auth.php

Doc Comments +1 added lines

@@ -28,6 +28,7 @@
 	 *
 	 * @see Requests_Hooks::register
 	 * @param Requests_Hooks $hooks Hook system
+	 * @return void
 	 */
 	public function register(Requests_Hooks &$hooks);
 }
\ No newline at end of file

Braces +2 added lines, -1 removed lines

@@ -18,7 +18,8 @@
  * @package Requests
  * @subpackage Authentication
  */
-interface Requests_Auth {
+interface Requests_Auth
+{
 	/**
 	 * Register hooks as needed
 	 *

php/Requests/libary/Requests/Cookie.php

Doc Comments +2 added lines, -1 removed lines

@@ -62,7 +62,7 @@ 
 	 *
 	 * @param string $name
 	 * @param string $value
-	 * @param array|Requests_Utility_CaseInsensitiveDictionary $attributes Associative array of attribute data
+	 * @param Requests_Utility_CaseInsensitiveDictionary $attributes Associative array of attribute data
 	 */
 	public function __construct($name, $value, $attributes = array(), $flags = array(), $reference_time = null) {
 		$this->name = $name;
@@ -377,6 +377,7 @@ 
 	 * specifies some of this handling, but not in a thorough manner.
 	 *
 	 * @param string Cookie header value (from a Set-Cookie header)
+	 * @param integer $reference_time
 	 * @return Requests_Cookie Parsed cookie object
 	 */
 	public static function parse($string, $name = '', $reference_time = null) {

Braces +128 added lines, -64 removed lines

@@ -12,7 +12,8 @@ 
  * @package Requests
  * @subpackage Cookies
  */
-class Requests_Cookie {
+class Requests_Cookie
+{
 	/**
 	 * Cookie name.
 	 *
@@ -64,7 +65,8 @@ 
 	 * @param string $value
 	 * @param array|Requests_Utility_CaseInsensitiveDictionary $attributes Associative array of attribute data
 	 */
-	public function __construct($name, $value, $attributes = array(), $flags = array(), $reference_time = null) {
+	public function __construct($name, $value, $attributes = array(), $flags = array(), $reference_time = null)
+	{
 		$this->name = $name;
 		$this->value = $value;
 		$this->attributes = $attributes;
@@ -77,7 +79,8 @@ 
 		$this->flags = array_merge($default_flags, $flags);
 
 		$this->reference_time = time();
-		if ($reference_time !== null) {
+		if ($reference_time !== null)
+		{
 			$this->reference_time = $reference_time;
 		}
 
@@ -92,17 +95,20 @@ 
 	 *
 	 * @return boolean True if expired, false if time is valid.
 	 */
-	public function is_expired() {
+	public function is_expired()
+	{
 		// RFC6265, s. 4.1.2.2:
 		// If a cookie has both the Max-Age and the Expires attribute, the Max-
 		// Age attribute has precedence and controls the expiration date of the
 		// cookie.
-		if (isset($this->attributes['max-age'])) {
+		if (isset($this->attributes['max-age']))
+		{
 			$max_age = $this->attributes['max-age'];
 			return $max_age < $this->reference_time;
 		}
 
-		if (isset($this->attributes['expires'])) {
+		if (isset($this->attributes['expires']))
+		{
 			$expires = $this->attributes['expires'];
 			return $expires < $this->reference_time;
 		}
@@ -116,12 +122,15 @@ 
 	 * @param Requests_IRI $uri URI to check
 	 * @return boolean Whether the cookie is valid for the given URI
 	 */
-	public function uri_matches(Requests_IRI $uri) {
-		if (!$this->domain_matches($uri->host)) {
+	public function uri_matches(Requests_IRI $uri)
+	{
+		if (!$this->domain_matches($uri->host))
+		{
 			return false;
 		}
 
-		if (!$this->path_matches($uri->path)) {
+		if (!$this->path_matches($uri->path))
+		{
 			return false;
 		}
 
@@ -134,38 +143,45 @@ 
 	 * @param string $string Domain to check
 	 * @return boolean Whether the cookie is valid for the given domain
 	 */
-	public function domain_matches($string) {
-		if (!isset($this->attributes['domain'])) {
+	public function domain_matches($string)
+	{
+		if (!isset($this->attributes['domain']))
+		{
 			// Cookies created manually; cookies created by Requests will set
 			// the domain to the requested domain
 			return true;
 		}
 
 		$domain_string = $this->attributes['domain'];
-		if ($domain_string === $string) {
+		if ($domain_string === $string)
+		{
 			// The domain string and the string are identical.
 			return true;
 		}
 
 		// If the cookie is marked as host-only and we don't have an exact
 		// match, reject the cookie
-		if ($this->flags['host-only'] === true) {
+		if ($this->flags['host-only'] === true)
+		{
 			return false;
 		}
 
-		if (strlen($string) <= strlen($domain_string)) {
+		if (strlen($string) <= strlen($domain_string))
+		{
 			// For obvious reasons, the string cannot be a suffix if the domain
 			// is shorter than the domain string
 			return false;
 		}
 
-		if (substr($string, -1 * strlen($domain_string)) !== $domain_string) {
+		if (substr($string, -1 * strlen($domain_string)) !== $domain_string)
+		{
 			// The domain string should be a suffix of the string.
 			return false;
 		}
 
 		$prefix = substr($string, 0, strlen($string) - strlen($domain_string));
-		if (substr($prefix, -1) !== '.') {
+		if (substr($prefix, -1) !== '.')
+		{
 			// The last character of the string that is not included in the
 			// domain string should be a %x2E (".") character.
 			return false;
@@ -183,13 +199,16 @@ 
 	 * @param string $request_path Path to check
 	 * @return boolean Whether the cookie is valid for the given path
 	 */
-	public function path_matches($request_path) {
-		if (empty($request_path)) {
+	public function path_matches($request_path)
+	{
+		if (empty($request_path))
+		{
 			// Normalize empty path to root
 			$request_path = '/';
 		}
 
-		if (!isset($this->attributes['path'])) {
+		if (!isset($this->attributes['path']))
+		{
 			// Cookies created manually; cookies created by Requests will set
 			// the path to the requested path
 			return true;
@@ -197,19 +216,23 @@ 
 
 		$cookie_path = $this->attributes['path'];
 
-		if ($cookie_path === $request_path) {
+		if ($cookie_path === $request_path)
+		{
 			// The cookie-path and the request-path are identical.
 			return true;
 		}
 
-		if (strlen($request_path) > strlen($cookie_path) && substr($request_path, 0, strlen($cookie_path)) === $cookie_path) {
-			if (substr($cookie_path, -1) === '/') {
+		if (strlen($request_path) > strlen($cookie_path) && substr($request_path, 0, strlen($cookie_path)) === $cookie_path)
+		{
+			if (substr($cookie_path, -1) === '/')
+			{
 				// The cookie-path is a prefix of the request-path, and the last
 				// character of the cookie-path is %x2F ("/").
 				return true;
 			}
 
-			if (substr($request_path, strlen($cookie_path), 1) === '/') {
+			if (substr($request_path, strlen($cookie_path), 1) === '/')
+			{
 				// The cookie-path is a prefix of the request-path, and the
 				// first character of the request-path that is not included in
 				// the cookie-path is a %x2F ("/") character.
@@ -225,16 +248,20 @@ 
 	 *
 	 * @return boolean Whether the cookie was successfully normalized
 	 */
-	public function normalize() {
-		foreach ($this->attributes as $key => $value) {
+	public function normalize()
+	{
+		foreach ($this->attributes as $key => $value)
+		{
 			$orig_value = $value;
 			$value = $this->normalize_attribute($key, $value);
-			if ($value === null) {
+			if ($value === null)
+			{
 				unset($this->attributes[$key]);
 				continue;
 			}
 
-			if ($value !== $orig_value) {
+			if ($value !== $orig_value)
+			{
 				$this->attributes[$key] = $value;
 			}
 		}
@@ -251,16 +278,20 @@ 
 	 * @param string|boolean $value Attribute value (string value, or true if empty/flag)
 	 * @return mixed Value if available, or null if the attribute value is invalid (and should be skipped)
 	 */
-	protected function normalize_attribute($name, $value) {
-		switch (strtolower($name)) {
+	protected function normalize_attribute($name, $value)
+	{
+		switch (strtolower($name))
+		{
 			case 'expires':
 				// Expiration parsing, as per RFC 6265 section 5.2.1
-				if (is_int($value)) {
+				if (is_int($value))
+				{
 					return $value;
 				}
 
 				$expiry_time = strtotime($value);
-				if ($expiry_time === false) {
+				if ($expiry_time === false)
+				{
 					return null;
 				}
 
@@ -268,20 +299,24 @@ 
 
 			case 'max-age':
 				// Expiration parsing, as per RFC 6265 section 5.2.2
-				if (is_int($value)) {
+				if (is_int($value))
+				{
 					return $value;
 				}
 
 				// Check that we have a valid age
-				if (!preg_match('/^-?\d+$/', $value)) {
+				if (!preg_match('/^-?\d+$/', $value))
+				{
 					return null;
 				}
 
 				$delta_seconds = (int) $value;
-				if ($delta_seconds <= 0) {
+				if ($delta_seconds <= 0)
+				{
 					$expiry_time = 0;
 				}
-				else {
+				else
+				{
 					$expiry_time = $this->reference_time + $delta_seconds;
 				}
 
@@ -289,7 +324,8 @@ 
 
 			case 'domain':
 				// Domain normalization, as per RFC 6265 section 5.2.3
-				if ($value[0] === '.') {
+				if ($value[0] === '.')
+				{
 					$value = substr($value, 1);
 				}
 
@@ -307,7 +343,8 @@ 
 	 *
 	 * @return string Cookie formatted for Cookie header
 	 */
-	public function format_for_header() {
+	public function format_for_header()
+	{
 		return sprintf('%s=%s', $this->name, $this->value);
 	}
 
@@ -318,7 +355,8 @@ 
 	 * @deprecated Use {@see Requests_Cookie::format_for_header}
 	 * @return string
 	 */
-	public function formatForHeader() {
+	public function formatForHeader()
+	{
 		return $this->format_for_header();
 	}
 
@@ -330,16 +368,21 @@ 
 	 *
 	 * @return string Cookie formatted for Set-Cookie header
 	 */
-	public function format_for_set_cookie() {
+	public function format_for_set_cookie()
+	{
 		$header_value = $this->format_for_header();
-		if (!empty($this->attributes)) {
+		if (!empty($this->attributes))
+		{
 			$parts = array();
-			foreach ($this->attributes as $key => $value) {
+			foreach ($this->attributes as $key => $value)
+			{
 				// Ignore non-associative attributes
-				if (is_numeric($key)) {
+				if (is_numeric($key))
+				{
 					$parts[] = $value;
 				}
-				else {
+				else
+				{
 					$parts[] = sprintf('%s=%s', $key, $value);
 				}
 			}
@@ -356,7 +399,8 @@ 
 	 * @deprecated Use {@see Requests_Cookie::format_for_set_cookie}
 	 * @return string
 	 */
-	public function formatForSetCookie() {
+	public function formatForSetCookie()
+	{
 		return $this->format_for_set_cookie();
 	}
 
@@ -365,7 +409,8 @@ 
 	 *
 	 * Attributes and other data can be accessed via methods.
 	 */
-	public function __toString() {
+	public function __toString()
+	{
 		return $this->value;
 	}
 
@@ -379,14 +424,17 @@ 
 	 * @param string Cookie header value (from a Set-Cookie header)
 	 * @return Requests_Cookie Parsed cookie object
 	 */
-	public static function parse($string, $name = '', $reference_time = null) {
+	public static function parse($string, $name = '', $reference_time = null)
+	{
 		$parts = explode(';', $string);
 		$kvparts = array_shift($parts);
 
-		if (!empty($name)) {
+		if (!empty($name))
+		{
 			$value = $string;
 		}
-		elseif (strpos($kvparts, '=') === false) {
+		elseif (strpos($kvparts, '=') === false)
+		{
 			// Some sites might only have a value without the equals separator.
 			// Deviate from RFC 6265 and pretend it was actually a blank name
 			// (`=foo`)
@@ -395,7 +443,8 @@ 
 			$name = '';
 			$value = $kvparts;
 		}
-		else {
+		else
+		{
 			list($name, $value) = explode('=', $kvparts, 2);
 		}
 		$name = trim($name);
@@ -404,13 +453,17 @@ 
 		// Attribute key are handled case-insensitively
 		$attributes = new Requests_Utility_CaseInsensitiveDictionary();
 
-		if (!empty($parts)) {
-			foreach ($parts as $part) {
-				if (strpos($part, '=') === false) {
+		if (!empty($parts))
+		{
+			foreach ($parts as $part)
+			{
+				if (strpos($part, '=') === false)
+				{
 					$part_key = $part;
 					$part_value = true;
 				}
-				else {
+				else
+				{
 					list($part_key, $part_value) = explode('=', $part, 2);
 					$part_value = trim($part_value);
 				}
@@ -431,43 +484,52 @@ 
 	 * @param int|null $time Reference time for expiration calculation
 	 * @return array
 	 */
-	public static function parse_from_headers(Requests_Response_Headers $headers, Requests_IRI $origin = null, $time = null) {
+	public static function parse_from_headers(Requests_Response_Headers $headers, Requests_IRI $origin = null, $time = null)
+	{
 		$cookie_headers = $headers->getValues('Set-Cookie');
-		if (empty($cookie_headers)) {
+		if (empty($cookie_headers))
+		{
 			return array();
 		}
 
 		$cookies = array();
-		foreach ($cookie_headers as $header) {
+		foreach ($cookie_headers as $header)
+		{
 			$parsed = self::parse($header, '', $time);
 
 			// Default domain/path attributes
-			if (empty($parsed->attributes['domain']) && !empty($origin)) {
+			if (empty($parsed->attributes['domain']) && !empty($origin))
+			{
 				$parsed->attributes['domain'] = $origin->host;
 				$parsed->flags['host-only'] = true;
 			}
-			else {
+			else
+			{
 				$parsed->flags['host-only'] = false;
 			}
 
 			$path_is_valid = (!empty($parsed->attributes['path']) && $parsed->attributes['path'][0] === '/');
-			if (!$path_is_valid && !empty($origin)) {
+			if (!$path_is_valid && !empty($origin))
+			{
 				$path = $origin->path;
 
 				// Default path normalization as per RFC 6265 section 5.1.4
-				if (substr($path, 0, 1) !== '/') {
+				if (substr($path, 0, 1) !== '/')
+				{
 					// If the uri-path is empty or if the first character of
 					// the uri-path is not a %x2F ("/") character, output
 					// %x2F ("/") and skip the remaining steps.
 					$path = '/';
 				}
-				elseif (substr_count($path, '/') === 1) {
+				elseif (substr_count($path, '/') === 1)
+				{
 					// If the uri-path contains no more than one %x2F ("/")
 					// character, output %x2F ("/") and skip the remaining
 					// step.
 					$path = '/';
 				}
-				else {
+				else
+				{
 					// Output the characters of the uri-path from the first
 					// character up to, but not including, the right-most
 					// %x2F ("/").
@@ -477,7 +539,8 @@ 
 			}
 
 			// Reject invalid cookie domains
-			if (!empty($origin) && !$parsed->domain_matches($origin->host)) {
+			if (!empty($origin) && !$parsed->domain_matches($origin->host))
+			{
 				continue;
 			}
 
@@ -494,7 +557,8 @@ 
 	 * @deprecated Use {@see Requests_Cookie::parse_from_headers}
 	 * @return string
 	 */
-	public static function parseFromHeaders(Requests_Response_Headers $headers) {
+	public static function parseFromHeaders(Requests_Response_Headers $headers)
+	{
 		return self::parse_from_headers($headers);
 	}
 }

php/Requests/libary/Requests/Exception/Transport/cURL.php

Doc Comments +3 added lines

@@ -29,6 +29,9 @@
 	 */
 	protected $reason = 'Unknown';
 
+	/**
+	 * @param string $message
+	 */
 	public function __construct($message, $type, $data = null, $code = 0) {
 		if ($type !== null) {
 			$this->type = $type;

Braces +12 added lines, -6 removed lines

@@ -1,6 +1,7 @@ 
 <?php
 
-class Requests_Exception_Transport_cURL extends Requests_Exception_Transport {
+class Requests_Exception_Transport_cURL extends Requests_Exception_Transport
+{
 
 	const EASY = 'cURLEasy';
 	const MULTI = 'cURLMulti';
@@ -29,16 +30,20 @@ 
 	 */
 	protected $reason = 'Unknown';
 
-	public function __construct($message, $type, $data = null, $code = 0) {
-		if ($type !== null) {
+	public function __construct($message, $type, $data = null, $code = 0)
+	{
+		if ($type !== null)
+		{
 			$this->type = $type;
 		}
 
-		if ($code !== null) {
+		if ($code !== null)
+		{
 			$this->code = $code;
 		}
 
-		if ($message !== null) {
+		if ($message !== null)
+		{
 			$this->reason = $message;
 		}
 
@@ -49,7 +54,8 @@ 
 	/**
 	 * Get the error message
 	 */
-	public function getReason() {
+	public function getReason()
+	{
 		return $this->reason;
 	}
 

php/Requests/libary/Requests/Hooker.php

Doc Comments +1 added lines

@@ -19,6 +19,7 @@
 	 * @param string $hook Hook name
 	 * @param callback $callback Function/method to call on event
 	 * @param int $priority Priority number. <0 is executed earlier, >0 is executed later
+	 * @return void
 	 */
 	public function register($hook, $callback, $priority = 0);
 

Braces +2 added lines, -1 removed lines

@@ -12,7 +12,8 @@
  * @package Requests
  * @subpackage Utilities
  */
-interface Requests_Hooker {
+interface Requests_Hooker
+{
 	/**
 	 * Register a callback for a hook
 	 *

php/Requests/GetKarma.php

Braces +2 added lines, -1 removed lines

@@ -1,7 +1,8 @@
 <?php
 
 
-class GetKarma extends AbstractRequest {
+class GetKarma extends AbstractRequest
+{
 		
     function getApiEndPoint()
     {