mmainstreet / jodel-web

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()
     {

php/Requests/SetLocation.php

Braces +2 added lines, -1 removed lines

@@ -1,7 +1,8 @@
 <?php
 
 
-class SetLocation extends AbstractRequest {
+class SetLocation extends AbstractRequest
+{
 		 /**
      * @var Location
      */

php/Requests/libary/Requests/Cookie/Jar.php

Braces +40 added lines, -20 removed lines

@@ -25,7 +25,8 @@ 
 	 *
 	 * @param array $cookies Existing cookie values
 	 */
-	public function __construct($cookies = array()) {
+	public function __construct($cookies = array())
+	{
 		$this->cookies = $cookies;
 	}
 
@@ -35,8 +36,10 @@ 
 	 * @param string|Requests_Cookie $cookie
 	 * @return Requests_Cookie
 	 */
-	public function normalize_cookie($cookie, $key = null) {
-		if ($cookie instanceof Requests_Cookie) {
+	public function normalize_cookie($cookie, $key = null)
+	{
+		if ($cookie instanceof Requests_Cookie)
+		{
 			return $cookie;
 		}
 
@@ -50,7 +53,8 @@ 
 	 * @deprecated Use {@see Requests_Cookie_Jar::normalize_cookie}
 	 * @return Requests_Cookie
 	 */
-	public function normalizeCookie($cookie, $key = null) {
+	public function normalizeCookie($cookie, $key = null)
+	{
 		return $this->normalize_cookie($cookie, $key);
 	}
 
@@ -60,7 +64,8 @@ 
 	 * @param string $key Item key
 	 * @return boolean Does the item exist?
 	 */
-	public function offsetExists($key) {
+	public function offsetExists($key)
+	{
 		return isset($this->cookies[$key]);
 	}
 
@@ -70,8 +75,10 @@ 
 	 * @param string $key Item key
 	 * @return string Item value
 	 */
-	public function offsetGet($key) {
-		if (!isset($this->cookies[$key])) {
+	public function offsetGet($key)
+	{
+		if (!isset($this->cookies[$key]))
+		{
 			return null;
 		}
 
@@ -86,8 +93,10 @@ 
 	 * @param string $key Item name
 	 * @param string $value Item value
 	 */
-	public function offsetSet($key, $value) {
-		if ($key === null) {
+	public function offsetSet($key, $value)
+	{
+		if ($key === null)
+		{
 			throw new Requests_Exception('Object is a dictionary, not a list', 'invalidset');
 		}
 
@@ -99,7 +108,8 @@ 
 	 *
 	 * @param string $key
 	 */
-	public function offsetUnset($key) {
+	public function offsetUnset($key)
+	{
 		unset($this->cookies[$key]);
 	}
 
@@ -108,7 +118,8 @@ 
 	 *
 	 * @return ArrayIterator
 	 */
-	public function getIterator() {
+	public function getIterator()
+	{
 		return new ArrayIterator($this->cookies);
 	}
 
@@ -117,7 +128,8 @@ 
 	 *
 	 * @param Requests_Hooker $hooks Hooking system
 	 */
-	public function register(Requests_Hooker $hooks) {
+	public function register(Requests_Hooker $hooks)
+	{
 		$hooks->register('requests.before_request', array($this, 'before_request'));
 		$hooks->register('requests.before_redirect_check', array($this, 'before_redirect_check'));
 	}
@@ -133,22 +145,28 @@ 
 	 * @param string $type
 	 * @param array $options
 	 */
-	public function before_request($url, &$headers, &$data, &$type, &$options) {
-		if (!$url instanceof Requests_IRI) {
+	public function before_request($url, &$headers, &$data, &$type, &$options)
+	{
+		if (!$url instanceof Requests_IRI)
+		{
 			$url = new Requests_IRI($url);
 		}
 
-		if (!empty($this->cookies)) {
+		if (!empty($this->cookies))
+		{
 			$cookies = array();
-			foreach ($this->cookies as $key => $cookie) {
+			foreach ($this->cookies as $key => $cookie)
+			{
 				$cookie = $this->normalize_cookie($cookie, $key);
 
 				// Skip expired cookies
-				if ($cookie->is_expired()) {
+				if ($cookie->is_expired())
+				{
 					continue;
 				}
 
-				if ($cookie->domain_matches($url->host)) {
+				if ($cookie->domain_matches($url->host))
+				{
 					$cookies[] = $cookie->format_for_header();
 				}
 			}
@@ -162,9 +180,11 @@ 
 	 *
 	 * @var Requests_Response $response
 	 */
-	public function before_redirect_check(Requests_Response &$return) {
+	public function before_redirect_check(Requests_Response &$return)
+	{
 		$url = $return->url;
-		if (!$url instanceof Requests_IRI) {
+		if (!$url instanceof Requests_IRI)
+		{
 			$url = new Requests_IRI($url);
 		}
 

php/Requests/libary/Requests/Auth.php

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/Proxy/HTTP.php

Braces +30 added lines, -15 removed lines

@@ -16,7 +16,8 @@ 
  * @subpackage Proxy
  * @since 1.6
  */
-class Requests_Proxy_HTTP implements Requests_Proxy {
+class Requests_Proxy_HTTP implements Requests_Proxy
+{
 	/**
 	 * Proxy host and port
 	 *
@@ -54,19 +55,25 @@ 
 	 * @throws Requests_Exception On incorrect number of arguments (`authbasicbadargs`)
 	 * @param array|null $args Array of user and password. Must have exactly two elements
 	 */
-	public function __construct($args = null) {
-		if (is_string($args)) {
+	public function __construct($args = null)
+	{
+		if (is_string($args))
+		{
 			$this->proxy = $args;
 		}
-		elseif (is_array($args)) {
-			if (count($args) == 1) {
+		elseif (is_array($args))
+		{
+			if (count($args) == 1)
+			{
 				list($this->proxy) = $args;
 			}
-			elseif (count($args) == 3) {
+			elseif (count($args) == 3)
+			{
 				list($this->proxy, $this->user, $this->pass) = $args;
 				$this->use_authentication = true;
 			}
-			else {
+			else
+			{
 				throw new Requests_Exception('Invalid number of arguments', 'proxyhttpbadargs');
 			}
 		}
@@ -82,12 +89,14 @@ 
 	 * @see fsockopen_header
 	 * @param Requests_Hooks $hooks Hook system
 	 */
-	public function register(Requests_Hooks &$hooks) {
+	public function register(Requests_Hooks &$hooks)
+	{
 		$hooks->register('curl.before_send', array(&$this, 'curl_before_send'));
 
 		$hooks->register('fsockopen.remote_socket', array(&$this, 'fsockopen_remote_socket'));
 		$hooks->register('fsockopen.remote_host_path', array(&$this, 'fsockopen_remote_host_path'));
-		if ($this->use_authentication) {
+		if ($this->use_authentication)
+		{
 			$hooks->register('fsockopen.after_headers', array(&$this, 'fsockopen_header'));
 		}
 	}
@@ -98,11 +107,13 @@ 
 	 * @since 1.6
 	 * @param resource $handle cURL resource
 	 */
-	public function curl_before_send(&$handle) {
+	public function curl_before_send(&$handle)
+	{
 		curl_setopt($handle, CURLOPT_PROXYTYPE, CURLPROXY_HTTP);
 		curl_setopt($handle, CURLOPT_PROXY, $this->proxy);
 
-		if ($this->use_authentication) {
+		if ($this->use_authentication)
+		{
 			curl_setopt($handle, CURLOPT_PROXYAUTH, CURLAUTH_ANY);
 			curl_setopt($handle, CURLOPT_PROXYUSERPWD, $this->get_auth_string());
 		}
@@ -114,7 +125,8 @@ 
 	 * @since 1.6
 	 * @param string $remote_socket Socket connection string
 	 */
-	public function fsockopen_remote_socket(&$remote_socket) {
+	public function fsockopen_remote_socket(&$remote_socket)
+	{
 		$remote_socket = $this->proxy;
 	}
 
@@ -125,7 +137,8 @@ 
 	 * @param string $path Path to send in HTTP request string ("GET ...")
 	 * @param string $url Full URL we're requesting
 	 */
-	public function fsockopen_remote_host_path(&$path, $url) {
+	public function fsockopen_remote_host_path(&$path, $url)
+	{
 		$path = $url;
 	}
 
@@ -135,7 +148,8 @@ 
 	 * @since 1.6
 	 * @param string $out HTTP header string
 	 */
-	public function fsockopen_header(&$out) {
+	public function fsockopen_header(&$out)
+	{
 		$out .= sprintf("Proxy-Authorization: Basic %s\r\n", base64_encode($this->get_auth_string()));
 	}
 
@@ -145,7 +159,8 @@ 
 	 * @since 1.6
 	 * @return string
 	 */
-	public function get_auth_string() {
+	public function get_auth_string()
+	{
 		return $this->user . ':' . $this->pass;
 	}
 }
\ No newline at end of file

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

Braces +134 added lines, -67 removed lines

@@ -12,7 +12,8 @@ 
  * @package Requests
  * @subpackage Transport
  */
-class Requests_Transport_cURL implements Requests_Transport {
+class Requests_Transport_cURL implements Requests_Transport
+{
 	const CURL_7_10_5 = 0x070A05;
 	const CURL_7_16_2 = 0x071002;
 
@@ -89,20 +90,24 @@ 
 	/**
 	 * Constructor
 	 */
-	public function __construct() {
+	public function __construct()
+	{
 		$curl = curl_version();
 		$this->version = $curl['version_number'];
 		$this->handle = curl_init();
 
 		curl_setopt($this->handle, CURLOPT_HEADER, false);
 		curl_setopt($this->handle, CURLOPT_RETURNTRANSFER, 1);
-		if ($this->version >= self::CURL_7_10_5) {
+		if ($this->version >= self::CURL_7_10_5)
+		{
 			curl_setopt($this->handle, CURLOPT_ENCODING, '');
 		}
-		if (defined('CURLOPT_PROTOCOLS')) {
+		if (defined('CURLOPT_PROTOCOLS'))
+		{
 			curl_setopt($this->handle, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
 		}
-		if (defined('CURLOPT_REDIR_PROTOCOLS')) {
+		if (defined('CURLOPT_REDIR_PROTOCOLS'))
+		{
 			curl_setopt($this->handle, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
 		}
 	}
@@ -110,8 +115,10 @@ 
 	/**
 	 * Destructor
 	 */
-	public function __destruct() {
-		if (is_resource($this->handle)) {
+	public function __destruct()
+	{
+		if (is_resource($this->handle))
+		{
 			curl_close($this->handle);
 		}
 	}
@@ -127,35 +134,42 @@ 
 	 * @param array $options Request options, see {@see Requests::response()} for documentation
 	 * @return string Raw HTTP result
 	 */
-	public function request($url, $headers = array(), $data = array(), $options = array()) {
+	public function request($url, $headers = array(), $data = array(), $options = array())
+	{
 		$this->hooks = $options['hooks'];
 
 		$this->setup_handle($url, $headers, $data, $options);
 
 		$options['hooks']->dispatch('curl.before_send', array(&$this->handle));
 
-		if ($options['filename'] !== false) {
+		if ($options['filename'] !== false)
+		{
 			$this->stream_handle = fopen($options['filename'], 'wb');
 		}
 
 		$this->response_data = '';
 		$this->response_bytes = 0;
 		$this->response_byte_limit = false;
-		if ($options['max_bytes'] !== false) {
+		if ($options['max_bytes'] !== false)
+		{
 			$this->response_byte_limit = $options['max_bytes'];
 		}
 
-		if (isset($options['verify'])) {
-			if ($options['verify'] === false) {
+		if (isset($options['verify']))
+		{
+			if ($options['verify'] === false)
+			{
 				curl_setopt($this->handle, CURLOPT_SSL_VERIFYHOST, 0);
 				curl_setopt($this->handle, CURLOPT_SSL_VERIFYPEER, 0);
 			}
-			elseif (is_string($options['verify'])) {
+			elseif (is_string($options['verify']))
+			{
 				curl_setopt($this->handle, CURLOPT_CAINFO, $options['verify']);
 			}
 		}
 
-		if (isset($options['verifyname']) && $options['verifyname'] === false) {
+		if (isset($options['verifyname']) && $options['verifyname'] === false)
+		{
 			curl_setopt($this->handle, CURLOPT_SSL_VERIFYHOST, 0);
 		}
 
@@ -164,7 +178,8 @@ 
 
 		$options['hooks']->dispatch('curl.after_send', array());
 
-		if (curl_errno($this->handle) === 23 || curl_errno($this->handle) === 61) {
+		if (curl_errno($this->handle) === 23 || curl_errno($this->handle) === 61)
+		{
 			// Reset encoding and try again
 			curl_setopt($this->handle, CURLOPT_ENCODING, 'none');
 
@@ -191,9 +206,11 @@ 
 	 * @param array $options Global options
 	 * @return array Array of Requests_Response objects (may contain Requests_Exception or string responses as well)
 	 */
-	public function request_multiple($requests, $options) {
+	public function request_multiple($requests, $options)
+	{
 		// If you're not requesting, we can't get any responses ¯\_(ツ)_/¯
-		if (empty($requests)) {
+		if (empty($requests))
+		{
 			return array();
 		}
 
@@ -202,7 +219,8 @@ 
 		$subhandles = array();
 
 		$class = get_class($this);
-		foreach ($requests as $id => $request) {
+		foreach ($requests as $id => $request)
+		{
 			$subrequests[$id] = new $class();
 			$subhandles[$id] = $subrequests[$id]->get_subrequest_handle($request['url'], $request['headers'], $request['data'], $request['options']);
 			$request['options']['hooks']->dispatch('curl.before_multi_add', array(&$subhandles[$id]));
@@ -214,10 +232,12 @@ 
 
 		$request['options']['hooks']->dispatch('curl.before_multi_exec', array(&$multihandle));
 
-		do {
+		do
+		{
 			$active = false;
 
-			do {
+			do
+			{
 				$status = curl_multi_exec($multihandle, $active);
 			}
 			while ($status === CURLM_CALL_MULTI_PERFORM);
@@ -225,17 +245,21 @@ 
 			$to_process = array();
 
 			// Read the information as needed
-			while ($done = curl_multi_info_read($multihandle)) {
+			while ($done = curl_multi_info_read($multihandle))
+			{
 				$key = array_search($done['handle'], $subhandles, true);
-				if (!isset($to_process[$key])) {
+				if (!isset($to_process[$key]))
+				{
 					$to_process[$key] = $done;
 				}
 			}
 
 			// Parse the finished requests before we start getting the new ones
-			foreach ($to_process as $key => $done) {
+			foreach ($to_process as $key => $done)
+			{
 				$options = $requests[$key]['options'];
-				if (CURLE_OK !== $done['result']) {
+				if (CURLE_OK !== $done['result'])
+				{
 					//get error string for handle.
 					$reason = curl_error($done['handle']);
 					$exception = new Requests_Exception_Transport_cURL(
@@ -247,7 +271,8 @@ 
 					$responses[$key] = $exception;
 					$options['hooks']->dispatch('transport.internal.parse_error', array(&$responses[$key], $requests[$key]));
 				}
-				else {
+				else
+				{
 					$responses[$key] = $subrequests[$key]->process_response($subrequests[$key]->response_data, $options);
 
 					$options['hooks']->dispatch('transport.internal.parse_response', array(&$responses[$key], $requests[$key]));
@@ -256,7 +281,8 @@ 
 				curl_multi_remove_handle($multihandle, $done['handle']);
 				curl_close($done['handle']);
 
-				if (!is_string($responses[$key])) {
+				if (!is_string($responses[$key]))
+				{
 					$options['hooks']->dispatch('multiple.request.complete', array(&$responses[$key], $key));
 				}
 				$completed++;
@@ -283,14 +309,16 @@ 
 	public function &get_subrequest_handle($url, $headers, $data, $options) {
 		$this->setup_handle($url, $headers, $data, $options);
 
-		if ($options['filename'] !== false) {
+		if ($options['filename'] !== false)
+		{
 			$this->stream_handle = fopen($options['filename'], 'wb');
 		}
 
 		$this->response_data = '';
 		$this->response_bytes = 0;
 		$this->response_byte_limit = false;
-		if ($options['max_bytes'] !== false) {
+		if ($options['max_bytes'] !== false)
+		{
 			$this->response_byte_limit = $options['max_bytes'];
 		}
 		$this->hooks = $options['hooks'];
@@ -306,29 +334,35 @@ 
 	 * @param string|array $data Data to send either as the POST body, or as parameters in the URL for a GET/HEAD
 	 * @param array $options Request options, see {@see Requests::response()} for documentation
 	 */
-	protected function setup_handle($url, $headers, $data, $options) {
+	protected function setup_handle($url, $headers, $data, $options)
+	{
 		$options['hooks']->dispatch('curl.before_request', array(&$this->handle));
 
 		// Force closing the connection for old versions of cURL (<7.22).
-		if ( ! isset( $headers['Connection'] ) ) {
+		if ( ! isset( $headers['Connection'] ) )
+		{
 			$headers['Connection'] = 'close';
 		}
 
 		$headers = Requests::flatten($headers);
 
-		if (!empty($data)) {
+		if (!empty($data))
+		{
 			$data_format = $options['data_format'];
 
-			if ($data_format === 'query') {
+			if ($data_format === 'query')
+			{
 				$url = self::format_get($url, $data);
 				$data = '';
 			}
-			elseif (!is_string($data)) {
+			elseif (!is_string($data))
+			{
 				$data = http_build_query($data, null, '&');
 			}
 		}
 
-		switch ($options['type']) {
+		switch ($options['type'])
+		{
 			case Requests::POST:
 				curl_setopt($this->handle, CURLOPT_POST, true);
 				curl_setopt($this->handle, CURLOPT_POSTFIELDS, $data);
@@ -346,7 +380,8 @@ 
 			case Requests::OPTIONS:
 			default:
 				curl_setopt($this->handle, CURLOPT_CUSTOMREQUEST, $options['type']);
-				if (!empty($data)) {
+				if (!empty($data))
+				{
 					curl_setopt($this->handle, CURLOPT_POSTFIELDS, $data);
 				}
 		}
@@ -359,33 +394,41 @@ 
 		// https://github.com/curl/curl/blob/4f45240bc84a9aa648c8f7243be7b79e9f9323a5/lib/hostip.c#L606-L609
 		$timeout = max($options['timeout'], 1);
 
-		if (is_int($timeout) || $this->version < self::CURL_7_16_2) {
+		if (is_int($timeout) || $this->version < self::CURL_7_16_2)
+		{
 			curl_setopt($this->handle, CURLOPT_TIMEOUT, ceil($timeout));
 		}
-		else {
+		else
+		{
 			curl_setopt($this->handle, CURLOPT_TIMEOUT_MS, round($timeout * 1000));
 		}
 
-		if (is_int($options['connect_timeout']) || $this->version < self::CURL_7_16_2) {
+		if (is_int($options['connect_timeout']) || $this->version < self::CURL_7_16_2)
+		{
 			curl_setopt($this->handle, CURLOPT_CONNECTTIMEOUT, ceil($options['connect_timeout']));
 		}
-		else {
+		else
+		{
 			curl_setopt($this->handle, CURLOPT_CONNECTTIMEOUT_MS, round($options['connect_timeout'] * 1000));
 		}
 		curl_setopt($this->handle, CURLOPT_URL, $url);
 		curl_setopt($this->handle, CURLOPT_REFERER, $url);
 		curl_setopt($this->handle, CURLOPT_USERAGENT, $options['useragent']);
-		if (!empty($headers)) {
+		if (!empty($headers))
+		{
 			curl_setopt($this->handle, CURLOPT_HTTPHEADER, $headers);
 		}
-		if ($options['protocol_version'] === 1.1) {
+		if ($options['protocol_version'] === 1.1)
+		{
 			curl_setopt($this->handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
 		}
-		else {
+		else
+		{
 			curl_setopt($this->handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
 		}
 
-		if (true === $options['blocking']) {
+		if (true === $options['blocking'])
+		{
 			curl_setopt($this->handle, CURLOPT_HEADERFUNCTION, array(&$this, 'stream_headers'));
 			curl_setopt($this->handle, CURLOPT_WRITEFUNCTION, array(&$this, 'stream_body'));
 			curl_setopt($this->handle, CURLOPT_BUFFERSIZE, Requests::BUFFER_SIZE);
@@ -399,21 +442,26 @@ 
 	 * @param array $options Request options
 	 * @return string HTTP response data including headers
 	 */
-	public function process_response($response, $options) {
-		if ($options['blocking'] === false) {
+	public function process_response($response, $options)
+	{
+		if ($options['blocking'] === false)
+		{
 			$fake_headers = '';
 			$options['hooks']->dispatch('curl.after_request', array(&$fake_headers));
 			return false;
 		}
-		if ($options['filename'] !== false) {
+		if ($options['filename'] !== false)
+		{
 			fclose($this->stream_handle);
 			$this->headers = trim($this->headers);
 		}
-		else {
+		else
+		{
 			$this->headers .= $response;
 		}
 
-		if (curl_errno($this->handle)) {
+		if (curl_errno($this->handle))
+		{
 			$error = sprintf(
 				'cURL error %s: %s',
 				curl_errno($this->handle),
@@ -434,17 +482,20 @@ 
 	 * @param string $headers Header string
 	 * @return integer Length of provided header
 	 */
-	public function stream_headers($handle, $headers) {
+	public function stream_headers($handle, $headers)
+	{
 		// Why do we do this? cURL will send both the final response and any
 		// interim responses, such as a 100 Continue. We don't need that.
 		// (We may want to keep this somewhere just in case)
-		if ($this->done_headers) {
+		if ($this->done_headers)
+		{
 			$this->headers = '';
 			$this->done_headers = false;
 		}
 		$this->headers .= $headers;
 
-		if ($headers === "\r\n") {
+		if ($headers === "\r\n")
+		{
 			$this->done_headers = true;
 		}
 		return strlen($headers);
@@ -459,28 +510,34 @@ 
 	 * @param string $data Body data
 	 * @return integer Length of provided data
 	 */
-	public function stream_body($handle, $data) {
+	public function stream_body($handle, $data)
+	{
 		$this->hooks->dispatch('request.progress', array($data, $this->response_bytes, $this->response_byte_limit));
 		$data_length = strlen($data);
 
 		// Are we limiting the response size?
-		if ($this->response_byte_limit) {
-			if ($this->response_bytes === $this->response_byte_limit) {
+		if ($this->response_byte_limit)
+		{
+			if ($this->response_bytes === $this->response_byte_limit)
+			{
 				// Already at maximum, move on
 				return $data_length;
 			}
 
-			if (($this->response_bytes + $data_length) > $this->response_byte_limit) {
+			if (($this->response_bytes + $data_length) > $this->response_byte_limit)
+			{
 				// Limit the length
 				$limited_length = ($this->response_byte_limit - $this->response_bytes);
 				$data = substr($data, 0, $limited_length);
 			}
 		}
 
-		if ($this->stream_handle) {
+		if ($this->stream_handle)
+		{
 			fwrite($this->stream_handle, $data);
 		}
-		else {
+		else
+		{
 			$this->response_data .= $data;
 		}
 
@@ -495,23 +552,29 @@ 
 	 * @param array|object $data Data to build query using, see {@see https://secure.php.net/http_build_query}
 	 * @return string URL with data
 	 */
-	protected static function format_get($url, $data) {
-		if (!empty($data)) {
+	protected static function format_get($url, $data)
+	{
+		if (!empty($data))
+		{
 			$url_parts = parse_url($url);
-			if (empty($url_parts['query'])) {
+			if (empty($url_parts['query']))
+			{
 				$query = $url_parts['query'] = '';
 			}
-			else {
+			else
+			{
 				$query = $url_parts['query'];
 			}
 
 			$query .= '&' . http_build_query($data, null, '&');
 			$query = trim($query, '&');
 
-			if (empty($url_parts['query'])) {
+			if (empty($url_parts['query']))
+			{
 				$url .= '?' . $query;
 			}
-			else {
+			else
+			{
 				$url = str_replace($url_parts['query'], $query, $url);
 			}
 		}
@@ -524,15 +587,19 @@ 
 	 * @codeCoverageIgnore
 	 * @return boolean True if the transport is valid, false otherwise.
 	 */
-	public static function test($capabilities = array()) {
-		if (!function_exists('curl_init') || !function_exists('curl_exec')) {
+	public static function test($capabilities = array())
+	{
+		if (!function_exists('curl_init') || !function_exists('curl_exec'))
+		{
 			return false;
 		}
 
 		// If needed, check that our installed curl version supports SSL
-		if (isset($capabilities['ssl']) && $capabilities['ssl']) {
+		if (isset($capabilities['ssl']) && $capabilities['ssl'])
+		{
 			$curl_version = curl_version();
-			if (!(CURL_VERSION_SSL & $curl_version['features'])) {
+			if (!(CURL_VERSION_SSL & $curl_version['features']))
+			{
 				return false;
 			}
 		}

php/Requests/libary/Requests/Transport/fsockopen.php

Braces +142 added lines, -71 removed lines

@@ -12,7 +12,8 @@ 
  * @package Requests
  * @subpackage Transport
  */
-class Requests_Transport_fsockopen implements Requests_Transport {
+class Requests_Transport_fsockopen implements Requests_Transport
+{
 	/**
 	 * Second to microsecond conversion
 	 *
@@ -55,11 +56,13 @@ 
 	 * @param array $options Request options, see {@see Requests::response()} for documentation
 	 * @return string Raw HTTP result
 	 */
-	public function request($url, $headers = array(), $data = array(), $options = array()) {
+	public function request($url, $headers = array(), $data = array(), $options = array())
+	{
 		$options['hooks']->dispatch('fsockopen.before_request');
 
 		$url_parts = parse_url($url);
-		if (empty($url_parts)) {
+		if (empty($url_parts))
+		{
 			throw new Requests_Exception('Invalid URL.', 'invalidurl', $url);
 		}
 		$host = $url_parts['host'];
@@ -68,9 +71,11 @@ 
 		$case_insensitive_headers = new Requests_Utility_CaseInsensitiveDictionary($headers);
 
 		// HTTPS support
-		if (isset($url_parts['scheme']) && strtolower($url_parts['scheme']) === 'https') {
+		if (isset($url_parts['scheme']) && strtolower($url_parts['scheme']) === 'https')
+		{
 			$remote_socket = 'ssl://' . $host;
-			if (!isset($url_parts['port'])) {
+			if (!isset($url_parts['port']))
+			{
 				$url_parts['port'] = 443;
 			}
 
@@ -82,36 +87,44 @@ 
 			$verifyname = true;
 
 			// SNI, if enabled (OpenSSL >=0.9.8j)
-			if (defined('OPENSSL_TLSEXT_SERVER_NAME') && OPENSSL_TLSEXT_SERVER_NAME) {
+			if (defined('OPENSSL_TLSEXT_SERVER_NAME') && OPENSSL_TLSEXT_SERVER_NAME)
+			{
 				$context_options['SNI_enabled'] = true;
-				if (isset($options['verifyname']) && $options['verifyname'] === false) {
+				if (isset($options['verifyname']) && $options['verifyname'] === false)
+				{
 					$context_options['SNI_enabled'] = false;
 				}
 			}
 
-			if (isset($options['verify'])) {
-				if ($options['verify'] === false) {
+			if (isset($options['verify']))
+			{
+				if ($options['verify'] === false)
+				{
 					$context_options['verify_peer'] = false;
 				}
-				elseif (is_string($options['verify'])) {
+				elseif (is_string($options['verify']))
+				{
 					$context_options['cafile'] = $options['verify'];
 				}
 			}
 
-			if (isset($options['verifyname']) && $options['verifyname'] === false) {
+			if (isset($options['verifyname']) && $options['verifyname'] === false)
+			{
 				$context_options['verify_peer_name'] = false;
 				$verifyname = false;
 			}
 
 			stream_context_set_option($context, array('ssl' => $context_options));
 		}
-		else {
+		else
+		{
 			$remote_socket = 'tcp://' . $host;
 		}
 
 		$this->max_bytes = $options['max_bytes'];
 
-		if (!isset($url_parts['port'])) {
+		if (!isset($url_parts['port']))
+		{
 			$url_parts['port'] = 80;
 		}
 		$remote_socket .= ':' . $url_parts['port'];
@@ -124,12 +137,15 @@ 
 
 		restore_error_handler();
 
-		if ($verifyname && !$this->verify_certificate_from_context($host, $context)) {
+		if ($verifyname && !$this->verify_certificate_from_context($host, $context))
+		{
 			throw new Requests_Exception('SSL certificate did not match the requested domain name', 'ssl.no_match');
 		}
 
-		if (!$socket) {
-			if ($errno === 0) {
+		if (!$socket)
+		{
+			if ($errno === 0)
+			{
 				// Connection issue
 				throw new Requests_Exception(rtrim($this->connect_error), 'fsockopen.connect_error');
 			}
@@ -139,11 +155,13 @@ 
 
 		$data_format = $options['data_format'];
 
-		if ($data_format === 'query') {
+		if ($data_format === 'query')
+		{
 			$path = self::format_get($url_parts, $data);
 			$data = '';
 		}
-		else {
+		else
+		{
 			$path = self::format_get($url_parts, array());
 		}
 
@@ -152,56 +170,69 @@ 
 		$request_body = '';
 		$out = sprintf("%s %s HTTP/%.1f\r\n", $options['type'], $path, $options['protocol_version']);
 
-		if ($options['type'] !== Requests::TRACE) {
-			if (is_array($data)) {
+		if ($options['type'] !== Requests::TRACE)
+		{
+			if (is_array($data))
+			{
 				$request_body = http_build_query($data, null, '&');
 			}
-			else {
+			else
+			{
 				$request_body = $data;
 			}
 
-			if (!empty($data)) {
-				if (!isset($case_insensitive_headers['Content-Length'])) {
+			if (!empty($data))
+			{
+				if (!isset($case_insensitive_headers['Content-Length']))
+				{
 					$headers['Content-Length'] = strlen($request_body);
 				}
 
-				if (!isset($case_insensitive_headers['Content-Type'])) {
+				if (!isset($case_insensitive_headers['Content-Type']))
+				{
 					$headers['Content-Type'] = 'application/x-www-form-urlencoded; charset=UTF-8';
 				}
 			}
 		}
 
-		if (!isset($case_insensitive_headers['Host'])) {
+		if (!isset($case_insensitive_headers['Host']))
+		{
 			$out .= sprintf('Host: %s', $url_parts['host']);
 
-			if (( 'http' === strtolower($url_parts['scheme']) && $url_parts['port'] !== 80 ) || ( 'https' === strtolower($url_parts['scheme']) && $url_parts['port'] !== 443 )) {
+			if (( 'http' === strtolower($url_parts['scheme']) && $url_parts['port'] !== 80 ) || ( 'https' === strtolower($url_parts['scheme']) && $url_parts['port'] !== 443 ))
+			{
 				$out .= ':' . $url_parts['port'];
 			}
 			$out .= "\r\n";
 		}
 
-		if (!isset($case_insensitive_headers['User-Agent'])) {
+		if (!isset($case_insensitive_headers['User-Agent']))
+		{
 			$out .= sprintf("User-Agent: %s\r\n", $options['useragent']);
 		}
 
 		$accept_encoding = $this->accept_encoding();
-		if (!isset($case_insensitive_headers['Accept-Encoding']) && !empty($accept_encoding)) {
+		if (!isset($case_insensitive_headers['Accept-Encoding']) && !empty($accept_encoding))
+		{
 			$out .= sprintf("Accept-Encoding: %s\r\n", $accept_encoding);
 		}
 
 		$headers = Requests::flatten($headers);
 
-		if (!empty($headers)) {
+		if (!empty($headers))
+		{
 			$out .= implode($headers, "\r\n") . "\r\n";
 		}
 
 		$options['hooks']->dispatch('fsockopen.after_headers', array(&$out));
 
-		if (substr($out, -2) !== "\r\n") {
+		if (substr($out, -2) !== "\r\n")
+		{
 			$out .= "\r\n";
 		}
 
-		if (!isset($case_insensitive_headers['Connection'])) {
+		if (!isset($case_insensitive_headers['Connection']))
+		{
 			$out .= "Connection: Close\r\n";
 		}
 
@@ -212,7 +243,8 @@ 
 		fwrite($socket, $out);
 		$options['hooks']->dispatch('fsockopen.after_send', array($out));
 
-		if (!$options['blocking']) {
+		if (!$options['blocking'])
+		{
 			fclose($socket);
 			$fake_headers = '';
 			$options['hooks']->dispatch('fsockopen.after_request', array(&$fake_headers));
@@ -220,10 +252,12 @@ 
 		}
 
 		$timeout_sec = (int) floor($options['timeout']);
-		if ($timeout_sec == $options['timeout']) {
+		if ($timeout_sec == $options['timeout'])
+		{
 			$timeout_msec = 0;
 		}
-		else {
+		else
+		{
 			$timeout_msec = self::SECOND_IN_MICROSECONDS * $options['timeout'] % self::SECOND_IN_MICROSECONDS;
 		}
 		stream_set_timeout($socket, $timeout_sec, $timeout_msec);
@@ -233,35 +267,44 @@ 
 		$size = 0;
 		$doingbody = false;
 		$download = false;
-		if ($options['filename']) {
+		if ($options['filename'])
+		{
 			$download = fopen($options['filename'], 'wb');
 		}
 
-		while (!feof($socket)) {
+		while (!feof($socket))
+		{
 			$this->info = stream_get_meta_data($socket);
-			if ($this->info['timed_out']) {
+			if ($this->info['timed_out'])
+			{
 				throw new Requests_Exception('fsocket timed out', 'timeout');
 			}
 
 			$block = fread($socket, Requests::BUFFER_SIZE);
-			if (!$doingbody) {
+			if (!$doingbody)
+			{
 				$response .= $block;
-				if (strpos($response, "\r\n\r\n")) {
+				if (strpos($response, "\r\n\r\n"))
+				{
 					list($headers, $block) = explode("\r\n\r\n", $response, 2);
 					$doingbody = true;
 				}
 			}
 
 			// Are we in body mode now?
-			if ($doingbody) {
+			if ($doingbody)
+			{
 				$options['hooks']->dispatch('request.progress', array($block, $size, $this->max_bytes));
 				$data_length = strlen($block);
-				if ($this->max_bytes) {
+				if ($this->max_bytes)
+				{
 					// Have we already hit a limit?
-					if ($size === $this->max_bytes) {
+					if ($size === $this->max_bytes)
+					{
 						continue;
 					}
-					if (($size + $data_length) > $this->max_bytes) {
+					if (($size + $data_length) > $this->max_bytes)
+					{
 						// Limit the length
 						$limited_length = ($this->max_bytes - $size);
 						$block = substr($block, 0, $limited_length);
@@ -269,20 +312,24 @@ 
 				}
 
 				$size += strlen($block);
-				if ($download) {
+				if ($download)
+				{
 					fwrite($download, $block);
 				}
-				else {
+				else
+				{
 					$body .= $block;
 				}
 			}
 		}
 		$this->headers = $headers;
 
-		if ($download) {
+		if ($download)
+		{
 			fclose($download);
 		}
-		else {
+		else
+		{
 			$this->headers .= "\r\n\r\n" . $body;
 		}
 		fclose($socket);
@@ -298,21 +345,26 @@ 
 	 * @param array $options Global options, see {@see Requests::response()} for documentation
 	 * @return array Array of Requests_Response objects (may contain Requests_Exception or string responses as well)
 	 */
-	public function request_multiple($requests, $options) {
+	public function request_multiple($requests, $options)
+	{
 		$responses = array();
 		$class = get_class($this);
-		foreach ($requests as $id => $request) {
-			try {
+		foreach ($requests as $id => $request)
+		{
+			try
+			{
 				$handler = new $class();
 				$responses[$id] = $handler->request($request['url'], $request['headers'], $request['data'], $request['options']);
 
 				$request['options']['hooks']->dispatch('transport.internal.parse_response', array(&$responses[$id], $request));
 			}
-			catch (Requests_Exception $e) {
+			catch (Requests_Exception $e)
+			{
 				$responses[$id] = $e;
 			}
 
-			if (!is_string($responses[$id])) {
+			if (!is_string($responses[$id]))
+			{
 				$request['options']['hooks']->dispatch('multiple.request.complete', array(&$responses[$id], $id));
 			}
 		}
@@ -325,13 +377,16 @@ 
 	 *
 	 * @return string Accept-Encoding header value
 	 */
-	protected static function accept_encoding() {
+	protected static function accept_encoding()
+	{
 		$type = array();
-		if (function_exists('gzinflate')) {
+		if (function_exists('gzinflate'))
+		{
 			$type[] = 'deflate;q=1.0';
 		}
 
-		if (function_exists('gzuncompress')) {
+		if (function_exists('gzuncompress'))
+		{
 			$type[] = 'compress;q=0.5';
 		}
 
@@ -347,24 +402,31 @@ 
 	 * @param array|object $data Data to build query using, see {@see https://secure.php.net/http_build_query}
 	 * @return string URL with data
 	 */
-	protected static function format_get($url_parts, $data) {
-		if (!empty($data)) {
-			if (empty($url_parts['query'])) {
+	protected static function format_get($url_parts, $data)
+	{
+		if (!empty($data))
+		{
+			if (empty($url_parts['query']))
+			{
 				$url_parts['query'] = '';
 			}
 
 			$url_parts['query'] .= '&' . http_build_query($data, null, '&');
 			$url_parts['query'] = trim($url_parts['query'], '&');
 		}
-		if (isset($url_parts['path'])) {
-			if (isset($url_parts['query'])) {
+		if (isset($url_parts['path']))
+		{
+			if (isset($url_parts['query']))
+			{
 				$get = $url_parts['path'] . '?' . $url_parts['query'];
 			}
-			else {
+			else
+			{
 				$get = $url_parts['path'];
 			}
 		}
-		else {
+		else
+		{
 			$get = '/';
 		}
 		return $get;
@@ -376,9 +438,11 @@ 
 	 * @param int $errno Error number (e.g. E_WARNING)
 	 * @param string $errstr Error message
 	 */
-	public function connect_error_handler($errno, $errstr) {
+	public function connect_error_handler($errno, $errstr)
+	{
 		// Double-check we can handle it
-		if (($errno & E_WARNING) === 0 && ($errno & E_NOTICE) === 0) {
+		if (($errno & E_WARNING) === 0 && ($errno & E_NOTICE) === 0)
+		{
 			// Return false to indicate the default error handler should engage
 			return false;
 		}
@@ -402,12 +466,14 @@ 
 	 * @param resource $context Stream context
 	 * @return bool
 	 */
-	public function verify_certificate_from_context($host, $context) {
+	public function verify_certificate_from_context($host, $context)
+	{
 		$meta = stream_context_get_options($context);
 
 		// If we don't have SSL options, then we couldn't make the connection at
 		// all
-		if (empty($meta) || empty($meta['ssl']) || empty($meta['ssl']['peer_certificate'])) {
+		if (empty($meta) || empty($meta['ssl']) || empty($meta['ssl']['peer_certificate']))
+		{
 			throw new Requests_Exception(rtrim($this->connect_error), 'ssl.connect_error');
 		}
 
@@ -422,19 +488,24 @@ 
 	 * @codeCoverageIgnore
 	 * @return boolean True if the transport is valid, false otherwise.
 	 */
-	public static function test($capabilities = array()) {
-		if (!function_exists('fsockopen')) {
+	public static function test($capabilities = array())
+	{
+		if (!function_exists('fsockopen'))
+		{
 			return false;
 		}
 
 		// If needed, check that streams support SSL
-		if (isset($capabilities['ssl']) && $capabilities['ssl']) {
-			if (!extension_loaded('openssl') || !function_exists('openssl_x509_parse')) {
+		if (isset($capabilities['ssl']) && $capabilities['ssl'])
+		{
+			if (!extension_loaded('openssl') || !function_exists('openssl_x509_parse'))
+			{
 				return false;
 			}
 
 			// Currently broken, thanks to https://github.com/facebook/hhvm/issues/2156
-			if (defined('HHVM_VERSION')) {
+			if (defined('HHVM_VERSION'))
+			{
 				return false;
 			}
 		}

php/Requests/libary/Requests/Session.php

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/Transport.php

Braces +2 added lines, -1 removed lines

@@ -12,7 +12,8 @@
  * @package Requests
  * @subpackage Transport
  */
-interface Requests_Transport {
+interface Requests_Transport
+{
 	/**
 	 * Perform a request
 	 *