mmainstreet / jodel-web

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

Spacing +56 added lines, -56 removed lines

@@ -59,7 +59,7 @@ 
 		$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 +68,9 @@ 
 		$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,23 +82,23 @@ 
 			$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;
 			}
@@ -111,12 +111,12 @@ 
 
 		$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'];
 
-		set_error_handler(array($this, 'connect_error_handler'), E_WARNING | E_NOTICE);
+		set_error_handler(array($this, 'connect_error_handler'), E_WARNING|E_NOTICE);
 
 		$options['hooks']->dispatch('fsockopen.remote_socket', array(&$remote_socket));
 
@@ -124,12 +124,12 @@ 
 
 		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,7 +139,7 @@ 
 
 		$data_format = $options['data_format'];
 
-		if ($data_format === 'query') {
+		if($data_format === 'query') {
 			$path = self::format_get($url_parts, $data);
 			$data = '';
 		}
@@ -152,56 +152,56 @@ 
 		$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 {
 				$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,15 +212,15 @@ 
 		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));
 			return '';
 		}
 
-		$timeout_sec = (int) floor($options['timeout']);
-		if ($timeout_sec == $options['timeout']) {
+		$timeout_sec = (int)floor($options['timeout']);
+		if($timeout_sec == $options['timeout']) {
 			$timeout_msec = 0;
 		}
 		else {
@@ -233,35 +233,35 @@ 
 		$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,7 +269,7 @@ 
 				}
 
 				$size += strlen($block);
-				if ($download) {
+				if($download) {
 					fwrite($download, $block);
 				}
 				else {
@@ -279,7 +279,7 @@ 
 		}
 		$this->headers = $headers;
 
-		if ($download) {
+		if($download) {
 			fclose($download);
 		}
 		else {
@@ -301,18 +301,18 @@ 
 	public function request_multiple($requests, $options) {
 		$responses = array();
 		$class = get_class($this);
-		foreach ($requests as $id => $request) {
+		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));
 			}
 		}
@@ -327,11 +327,11 @@ 
 	 */
 	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';
 		}
 
@@ -348,16 +348,16 @@ 
 	 * @return string URL with data
 	 */
 	protected static function format_get($url_parts, $data) {
-		if (!empty($data)) {
-			if (empty($url_parts['query'])) {
+		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 {
@@ -378,7 +378,7 @@ 
 	 */
 	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;
 		}
@@ -407,7 +407,7 @@ 
 
 		// 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');
 		}
 
@@ -423,18 +423,18 @@ 
 	 * @return boolean True if the transport is valid, false otherwise.
 	 */
 	public static function test($capabilities = array()) {
-		if (!function_exists('fsockopen')) {
+		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;
 			}
 		}

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;
 			}
 		}

Upper-Lower-Casing +25 added lines, -25 removed lines

@@ -39,7 +39,7 @@ 
 	 *
 	 * @var int|bool Byte count, or false if no limit.
 	 */
-	protected $max_bytes = false;
+	protected $max_bytes = FALSE;
 
 	protected $connect_error = '';
 
@@ -64,7 +64,7 @@ 
 		}
 		$host = $url_parts['host'];
 		$context = stream_context_create();
-		$verifyname = false;
+		$verifyname = FALSE;
 		$case_insensitive_headers = new Requests_Utility_CaseInsensitiveDictionary($headers);
 
 		// HTTPS support
@@ -75,32 +75,32 @@ 
 			}
 
 			$context_options = array(
-				'verify_peer' => true,
+				'verify_peer' => TRUE,
 				// 'CN_match' => $host,
-				'capture_peer_cert' => true
+				'capture_peer_cert' => TRUE
 			);
-			$verifyname = true;
+			$verifyname = TRUE;
 
 			// SNI, if enabled (OpenSSL >=0.9.8j)
 			if (defined('OPENSSL_TLSEXT_SERVER_NAME') && OPENSSL_TLSEXT_SERVER_NAME) {
-				$context_options['SNI_enabled'] = true;
-				if (isset($options['verifyname']) && $options['verifyname'] === false) {
-					$context_options['SNI_enabled'] = false;
+				$context_options['SNI_enabled'] = TRUE;
+				if (isset($options['verifyname']) && $options['verifyname'] === FALSE) {
+					$context_options['SNI_enabled'] = FALSE;
 				}
 			}
 
 			if (isset($options['verify'])) {
-				if ($options['verify'] === false) {
-					$context_options['verify_peer'] = false;
+				if ($options['verify'] === FALSE) {
+					$context_options['verify_peer'] = FALSE;
 				}
 				elseif (is_string($options['verify'])) {
 					$context_options['cafile'] = $options['verify'];
 				}
 			}
 
-			if (isset($options['verifyname']) && $options['verifyname'] === false) {
-				$context_options['verify_peer_name'] = false;
-				$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));
@@ -134,7 +134,7 @@ 
 				throw new Requests_Exception(rtrim($this->connect_error), 'fsockopen.connect_error');
 			}
 
-			throw new Requests_Exception($errstr, 'fsockopenerror', null, $errno);
+			throw new Requests_Exception($errstr, 'fsockopenerror', NULL, $errno);
 		}
 
 		$data_format = $options['data_format'];
@@ -154,7 +154,7 @@ 
 
 		if ($options['type'] !== Requests::TRACE) {
 			if (is_array($data)) {
-				$request_body = http_build_query($data, null, '&');
+				$request_body = http_build_query($data, NULL, '&');
 			}
 			else {
 				$request_body = $data;
@@ -231,8 +231,8 @@ 
 		$response = $body = $headers = '';
 		$this->info = stream_get_meta_data($socket);
 		$size = 0;
-		$doingbody = false;
-		$download = false;
+		$doingbody = FALSE;
+		$download = FALSE;
 		if ($options['filename']) {
 			$download = fopen($options['filename'], 'wb');
 		}
@@ -248,7 +248,7 @@ 
 				$response .= $block;
 				if (strpos($response, "\r\n\r\n")) {
 					list($headers, $block) = explode("\r\n\r\n", $response, 2);
-					$doingbody = true;
+					$doingbody = TRUE;
 				}
 			}
 
@@ -353,7 +353,7 @@ 
 				$url_parts['query'] = '';
 			}
 
-			$url_parts['query'] .= '&' . http_build_query($data, null, '&');
+			$url_parts['query'] .= '&' . http_build_query($data, NULL, '&');
 			$url_parts['query'] = trim($url_parts['query'], '&');
 		}
 		if (isset($url_parts['path'])) {
@@ -380,11 +380,11 @@ 
 		// Double-check we can handle it
 		if (($errno & E_WARNING) === 0 && ($errno & E_NOTICE) === 0) {
 			// Return false to indicate the default error handler should engage
-			return false;
+			return FALSE;
 		}
 
 		$this->connect_error .= $errstr . "\n";
-		return true;
+		return TRUE;
 	}
 
 	/**
@@ -424,21 +424,21 @@ 
 	 */
 	public static function test($capabilities = array()) {
 		if (!function_exists('fsockopen')) {
-			return false;
+			return FALSE;
 		}
 
 		// If needed, check that streams support SSL
 		if (isset($capabilities['ssl']) && $capabilities['ssl']) {
 			if (!extension_loaded('openssl') || !function_exists('openssl_x509_parse')) {
-				return false;
+				return FALSE;
 			}
 
 			// Currently broken, thanks to https://github.com/facebook/hhvm/issues/2156
 			if (defined('HHVM_VERSION')) {
-				return false;
+				return FALSE;
 			}
 		}
 
-		return true;
+		return TRUE;
 	}
 }

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
 	 *

php/Requests/libary/Requests/Utility/CaseInsensitiveDictionary.php

Spacing +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@ 
 	 * @param array $data Dictionary/map to convert to case-insensitive
 	 */
 	public function __construct(array $data = array()) {
-		foreach ($data as $key => $value) {
+		foreach($data as $key => $value) {
 			$this->offsetSet($key, $value);
 		}
 	}
@@ -50,7 +50,7 @@ 
 	 */
 	public function offsetGet($key) {
 		$key = strtolower($key);
-		if (!isset($this->data[$key])) {
+		if(!isset($this->data[$key])) {
 			return null;
 		}
 
@@ -66,7 +66,7 @@ 
 	 * @param string $value Item value
 	 */
 	public function offsetSet($key, $value) {
-		if ($key === null) {
+		if($key === null) {
 			throw new Requests_Exception('Object is a dictionary, not a list', 'invalidset');
 		}
 

Braces +20 added lines, -10 removed lines

@@ -25,8 +25,10 @@ 
 	 *
 	 * @param array $data Dictionary/map to convert to case-insensitive
 	 */
-	public function __construct(array $data = array()) {
-		foreach ($data as $key => $value) {
+	public function __construct(array $data = array())
+	{
+		foreach ($data as $key => $value)
+		{
 			$this->offsetSet($key, $value);
 		}
 	}
@@ -37,7 +39,8 @@ 
 	 * @param string $key Item key
 	 * @return boolean Does the item exist?
 	 */
-	public function offsetExists($key) {
+	public function offsetExists($key)
+	{
 		$key = strtolower($key);
 		return isset($this->data[$key]);
 	}
@@ -48,9 +51,11 @@ 
 	 * @param string $key Item key
 	 * @return string Item value
 	 */
-	public function offsetGet($key) {
+	public function offsetGet($key)
+	{
 		$key = strtolower($key);
-		if (!isset($this->data[$key])) {
+		if (!isset($this->data[$key]))
+		{
 			return null;
 		}
 
@@ -65,8 +70,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');
 		}
 
@@ -79,7 +86,8 @@ 
 	 *
 	 * @param string $key
 	 */
-	public function offsetUnset($key) {
+	public function offsetUnset($key)
+	{
 		unset($this->data[strtolower($key)]);
 	}
 
@@ -88,7 +96,8 @@ 
 	 *
 	 * @return ArrayIterator
 	 */
-	public function getIterator() {
+	public function getIterator()
+	{
 		return new ArrayIterator($this->data);
 	}
 
@@ -97,7 +106,8 @@ 
 	 *
 	 * @return array Header data
 	 */
-	public function getAll() {
+	public function getAll()
+	{
 		return $this->data;
 	}
 }

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -51,7 +51,7 @@ 
 	public function offsetGet($key) {
 		$key = strtolower($key);
 		if (!isset($this->data[$key])) {
-			return null;
+			return NULL;
 		}
 
 		return $this->data[$key];
@@ -66,7 +66,7 @@ 
 	 * @param string $value Item value
 	 */
 	public function offsetSet($key, $value) {
-		if ($key === null) {
+		if ($key === NULL) {
 			throw new Requests_Exception('Object is a dictionary, not a list', 'invalidset');
 		}
 

php/Requests/libary/Requests/Utility/FilteredIterator.php

Braces +6 added lines, -3 removed lines

@@ -12,7 +12,8 @@ 
  * @package Requests
  * @subpackage Utilities
  */
-class Requests_Utility_FilteredIterator extends ArrayIterator {
+class Requests_Utility_FilteredIterator extends ArrayIterator
+{
 	/**
 	 * Callback to run as a filter
 	 *
@@ -26,7 +27,8 @@ 
 	 * @param array $data
 	 * @param callable $callback Callback to be called on each value
 	 */
-	public function __construct($data, $callback) {
+	public function __construct($data, $callback)
+	{
 		parent::__construct($data);
 
 		$this->callback = $callback;
@@ -37,7 +39,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function current() {
+	public function current()
+	{
 		$value = parent::current();
 		$value = call_user_func($this->callback, $value);
 		return $value;

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

Braces +2 added lines, -1 removed lines

@@ -1,5 +1,6 @@
 <?php
 
-class Requests_Exception_Transport extends Requests_Exception {
+class Requests_Exception_Transport extends Requests_Exception
+{
 
 }

php/Requests/libary/Requests/Exception/HTTP.php

Spacing +3 added lines, -3 removed lines

@@ -35,7 +35,7 @@ 
 	 * @param mixed $data Associated data
 	 */
 	public function __construct($reason = null, $data = null) {
-		if ($reason !== null) {
+		if($reason !== null) {
 			$this->reason = $reason;
 		}
 
@@ -57,12 +57,12 @@ 
 	 * @return string Exception class name to use
 	 */
 	public static function get_class($code) {
-		if (!$code) {
+		if(!$code) {
 			return 'Requests_Exception_HTTP_Unknown';
 		}
 
 		$class = sprintf('Requests_Exception_HTTP_%d', $code);
-		if (class_exists($class)) {
+		if(class_exists($class)) {
 			return $class;
 		}
 

Braces +14 added lines, -7 removed lines

@@ -10,7 +10,8 @@ 
  *
  * @package Requests
  */
-class Requests_Exception_HTTP extends Requests_Exception {
+class Requests_Exception_HTTP extends Requests_Exception
+{
 	/**
 	 * HTTP status code
 	 *
@@ -34,8 +35,10 @@ 
 	 * @param string|null $reason Reason phrase
 	 * @param mixed $data Associated data
 	 */
-	public function __construct($reason = null, $data = null) {
-		if ($reason !== null) {
+	public function __construct($reason = null, $data = null)
+	{
+		if ($reason !== null)
+		{
 			$this->reason = $reason;
 		}
 
@@ -46,7 +49,8 @@ 
 	/**
 	 * Get the status message
 	 */
-	public function getReason() {
+	public function getReason()
+	{
 		return $this->reason;
 	}
 
@@ -56,13 +60,16 @@ 
 	 * @param int|bool $code HTTP status code, or false if unavailable
 	 * @return string Exception class name to use
 	 */
-	public static function get_class($code) {
-		if (!$code) {
+	public static function get_class($code)
+	{
+		if (!$code)
+		{
 			return 'Requests_Exception_HTTP_Unknown';
 		}
 
 		$class = sprintf('Requests_Exception_HTTP_%d', $code);
-		if (class_exists($class)) {
+		if (class_exists($class))
+		{
 			return $class;
 		}
 

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -34,8 +34,8 @@
 	 * @param string|null $reason Reason phrase
 	 * @param mixed $data Associated data
 	 */
-	public function __construct($reason = null, $data = null) {
-		if ($reason !== null) {
+	public function __construct($reason = NULL, $data = NULL) {
+		if ($reason !== NULL) {
 			$this->reason = $reason;
 		}
 

php/Requests/libary/Requests/Exception/HTTP/414.php

Braces +2 added lines, -1 removed lines

@@ -10,7 +10,8 @@
  *
  * @package Requests
  */
-class Requests_Exception_HTTP_414 extends Requests_Exception_HTTP {
+class Requests_Exception_HTTP_414 extends Requests_Exception_HTTP
+{
 	/**
 	 * HTTP status code
 	 *

php/Requests/libary/Requests/Exception/HTTP/408.php

Braces +2 added lines, -1 removed lines

@@ -10,7 +10,8 @@
  *
  * @package Requests
  */
-class Requests_Exception_HTTP_408 extends Requests_Exception_HTTP {
+class Requests_Exception_HTTP_408 extends Requests_Exception_HTTP
+{
 	/**
 	 * HTTP status code
 	 *

php/Requests/libary/Requests/Exception/HTTP/511.php

Braces +2 added lines, -1 removed lines

@@ -12,7 +12,8 @@
  * @see https://tools.ietf.org/html/rfc6585
  * @package Requests
  */
-class Requests_Exception_HTTP_511 extends Requests_Exception_HTTP {
+class Requests_Exception_HTTP_511 extends Requests_Exception_HTTP
+{
 	/**
 	 * HTTP status code
 	 *