mmainstreet / jodel-web

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

Braces +2 added lines, -1 removed lines

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

php/Requests/libary/Requests/Hooks.php

Braces +18 added lines, -9 removed lines

@@ -12,7 +12,8 @@ 
  * @package Requests
  * @subpackage Utilities
  */
-class Requests_Hooks implements Requests_Hooker {
+class Requests_Hooks implements Requests_Hooker
+{
 	/**
 	 * Registered callbacks for each hook
 	 *
@@ -23,7 +24,8 @@ 
 	/**
 	 * Constructor
 	 */
-	public function __construct() {
+	public function __construct()
+	{
 		// pass
 	}
 
@@ -34,11 +36,14 @@ 
 	 * @param callback $callback Function/method to call on event
 	 * @param int $priority Priority number. <0 is executed earlier, >0 is executed later
 	 */
-	public function register($hook, $callback, $priority = 0) {
-		if (!isset($this->hooks[$hook])) {
+	public function register($hook, $callback, $priority = 0)
+	{
+		if (!isset($this->hooks[$hook]))
+		{
 			$this->hooks[$hook] = array();
 		}
-		if (!isset($this->hooks[$hook][$priority])) {
+		if (!isset($this->hooks[$hook][$priority]))
+		{
 			$this->hooks[$hook][$priority] = array();
 		}
 
@@ -52,13 +57,17 @@ 
 	 * @param array $parameters Parameters to pass to callbacks
 	 * @return boolean Successfulness
 	 */
-	public function dispatch($hook, $parameters = array()) {
-		if (empty($this->hooks[$hook])) {
+	public function dispatch($hook, $parameters = array())
+	{
+		if (empty($this->hooks[$hook]))
+		{
 			return false;
 		}
 
-		foreach ($this->hooks[$hook] as $priority => $hooked) {
-			foreach ($hooked as $callback) {
+		foreach ($this->hooks[$hook] as $priority => $hooked)
+		{
+			foreach ($hooked as $callback)
+			{
 				call_user_func_array($callback, $parameters);
 			}
 		}

php/Requests/libary/Requests/SSL.php

Braces +40 added lines, -20 removed lines

@@ -14,7 +14,8 @@ 
  * @package Requests
  * @subpackage Utilities
  */
-class Requests_SSL {
+class Requests_SSL
+{
 	/**
 	 * Verify the certificate against common name and subject alternative names
 	 *
@@ -29,10 +30,12 @@ 
 	 * @param array $cert Certificate data from openssl_x509_parse()
 	 * @return bool
 	 */
-	public static function verify_certificate($host, $cert) {
+	public static function verify_certificate($host, $cert)
+	{
 		// Calculate the valid wildcard match if the host is not an IP address
 		$parts = explode('.', $host);
-		if (ip2long($host) === false) {
+		if (ip2long($host) === false)
+		{
 			$parts[0] = '*';
 		}
 		$wildcard = implode('.', $parts);
@@ -40,11 +43,14 @@ 
 		$has_dns_alt = false;
 
 		// Check the subjectAltName
-		if (!empty($cert['extensions']) && !empty($cert['extensions']['subjectAltName'])) {
+		if (!empty($cert['extensions']) && !empty($cert['extensions']['subjectAltName']))
+		{
 			$altnames = explode(',', $cert['extensions']['subjectAltName']);
-			foreach ($altnames as $altname) {
+			foreach ($altnames as $altname)
+			{
 				$altname = trim($altname);
-				if (strpos($altname, 'DNS:') !== 0) {
+				if (strpos($altname, 'DNS:') !== 0)
+				{
 					continue;
 				}
 
@@ -54,7 +60,8 @@ 
 				$altname = trim(substr($altname, 4));
 
 				// Check for a match
-				if (self::match_domain($host, $altname) === true) {
+				if (self::match_domain($host, $altname) === true)
+				{
 					return true;
 				}
 			}
@@ -62,9 +69,11 @@ 
 
 		// Fall back to checking the common name if we didn't get any dNSName
 		// alt names, as per RFC2818
-		if (!$has_dns_alt && !empty($cert['subject']['CN'])) {
+		if (!$has_dns_alt && !empty($cert['subject']['CN']))
+		{
 			// Check for a match
-			if (self::match_domain($host, $cert['subject']['CN']) === true) {
+			if (self::match_domain($host, $cert['subject']['CN']) === true)
+			{
 				return true;
 			}
 		}
@@ -88,27 +97,33 @@ 
 	 * @param string $reference Reference dNSName
 	 * @return boolean Is the name valid?
 	 */
-	public static function verify_reference_name($reference) {
+	public static function verify_reference_name($reference)
+	{
 		$parts = explode('.', $reference);
 
 		// Check the first part of the name
 		$first = array_shift($parts);
 
-		if (strpos($first, '*') !== false) {
+		if (strpos($first, '*') !== false)
+		{
 			// Check that the wildcard is the full part
-			if ($first !== '*') {
+			if ($first !== '*')
+			{
 				return false;
 			}
 
 			// Check that we have at least 3 components (including first)
-			if (count($parts) < 2) {
+			if (count($parts) < 2)
+			{
 				return false;
 			}
 		}
 
 		// Check the remaining parts
-		foreach ($parts as $part) {
-			if (strpos($part, '*') !== false) {
+		foreach ($parts as $part)
+		{
+			if (strpos($part, '*') !== false)
+			{
 				return false;
 			}
 		}
@@ -124,25 +139,30 @@ 
 	 * @param string $reference dNSName to match against
 	 * @return boolean Does the domain match?
 	 */
-	public static function match_domain($host, $reference) {
+	public static function match_domain($host, $reference)
+	{
 		// Check if the reference is blacklisted first
-		if (self::verify_reference_name($reference) !== true) {
+		if (self::verify_reference_name($reference) !== true)
+		{
 			return false;
 		}
 
 		// Check for a direct match
-		if ($host === $reference) {
+		if ($host === $reference)
+		{
 			return true;
 		}
 
 		// Calculate the valid wildcard match if the host is not an IP address
 		// Also validates that the host has 3 parts or more, as per Firefox's
 		// ruleset.
-		if (ip2long($host) === false) {
+		if (ip2long($host) === false)
+		{
 			$parts = explode('.', $host);
 			$parts[0] = '*';
 			$wildcard = implode('.', $parts);
-			if ($wildcard === $reference) {
+			if ($wildcard === $reference)
+			{
 				return true;
 			}
 		}

php/Requests/libary/Requests/IPv6.php

Braces +56 added lines, -28 removed lines

@@ -15,7 +15,8 @@ 
  * @package Requests
  * @subpackage Utilities
  */
-class Requests_IPv6 {
+class Requests_IPv6
+{
 	/**
 	 * Uncompresses an IPv6 address
 	 *
@@ -34,8 +35,10 @@ 
 	 * @param string $ip An IPv6 address
 	 * @return string The uncompressed IPv6 address
 	 */
-	public static function uncompress($ip) {
-		if (substr_count($ip, '::') !== 1) {
+	public static function uncompress($ip)
+	{
+		if (substr_count($ip, '::') !== 1)
+		{
 			return $ip;
 		}
 
@@ -43,25 +46,30 @@ 
 		$c1 = ($ip1 === '') ? -1 : substr_count($ip1, ':');
 		$c2 = ($ip2 === '') ? -1 : substr_count($ip2, ':');
 
-		if (strpos($ip2, '.') !== false) {
+		if (strpos($ip2, '.') !== false)
+		{
 			$c2++;
 		}
 		// ::
-		if ($c1 === -1 && $c2 === -1) {
+		if ($c1 === -1 && $c2 === -1)
+		{
 			$ip = '0:0:0:0:0:0:0:0';
 		}
 		// ::xxx
-		else if ($c1 === -1) {
+		else if ($c1 === -1)
+		{
 			$fill = str_repeat('0:', 7 - $c2);
 			$ip = str_replace('::', $fill, $ip);
 		}
 		// xxx::
-		else if ($c2 === -1) {
+		else if ($c2 === -1)
+		{
 			$fill = str_repeat(':0', 7 - $c1);
 			$ip = str_replace('::', $fill, $ip);
 		}
 		// xxx::xxx
-		else {
+		else
+		{
 			$fill = ':' . str_repeat('0:', 6 - $c2 - $c1);
 			$ip = str_replace('::', $fill, $ip);
 		}
@@ -82,7 +90,8 @@ 
 	 * @param string $ip An IPv6 address
 	 * @return string The compressed IPv6 address
 	 */
-	public static function compress($ip) {
+	public static function compress($ip)
+	{
 		// Prepare the IP to be compressed
 		$ip = self::uncompress($ip);
 		$ip_parts = self::split_v6_v4($ip);
@@ -91,11 +100,14 @@ 
 		$ip_parts[0] = preg_replace('/(^|:)0+([0-9])/', '\1\2', $ip_parts[0]);
 
 		// Find bunches of zeros
-		if (preg_match_all('/(?:^|:)(?:0(?::|$))+/', $ip_parts[0], $matches, PREG_OFFSET_CAPTURE)) {
+		if (preg_match_all('/(?:^|:)(?:0(?::|$))+/', $ip_parts[0], $matches, PREG_OFFSET_CAPTURE))
+		{
 			$max = 0;
 			$pos = null;
-			foreach ($matches[0] as $match) {
-				if (strlen($match[0]) > $max) {
+			foreach ($matches[0] as $match)
+			{
+				if (strlen($match[0]) > $max)
+				{
 					$max = strlen($match[0]);
 					$pos = $match[1];
 				}
@@ -104,10 +116,12 @@ 
 			$ip_parts[0] = substr_replace($ip_parts[0], '::', $pos, $max);
 		}
 
-		if ($ip_parts[1] !== '') {
+		if ($ip_parts[1] !== '')
+		{
 			return implode(':', $ip_parts);
 		}
-		else {
+		else
+		{
 			return $ip_parts[0];
 		}
 	}
@@ -124,14 +138,17 @@ 
 	 * @param string $ip An IPv6 address
 	 * @return string[] [0] contains the IPv6 represented part, and [1] the IPv4 represented part
 	 */
-	protected static function split_v6_v4($ip) {
-		if (strpos($ip, '.') !== false) {
+	protected static function split_v6_v4($ip)
+	{
+		if (strpos($ip, '.') !== false)
+		{
 			$pos = strrpos($ip, ':');
 			$ipv6_part = substr($ip, 0, $pos);
 			$ipv4_part = substr($ip, $pos + 1);
 			return array($ipv6_part, $ipv4_part);
 		}
-		else {
+		else
+		{
 			return array($ip, '');
 		}
 	}
@@ -144,46 +161,57 @@ 
 	 * @param string $ip An IPv6 address
 	 * @return bool true if $ip is a valid IPv6 address
 	 */
-	public static function check_ipv6($ip) {
+	public static function check_ipv6($ip)
+	{
 		$ip = self::uncompress($ip);
 		list($ipv6, $ipv4) = self::split_v6_v4($ip);
 		$ipv6 = explode(':', $ipv6);
 		$ipv4 = explode('.', $ipv4);
-		if (count($ipv6) === 8 && count($ipv4) === 1 || count($ipv6) === 6 && count($ipv4) === 4) {
-			foreach ($ipv6 as $ipv6_part) {
+		if (count($ipv6) === 8 && count($ipv4) === 1 || count($ipv6) === 6 && count($ipv4) === 4)
+		{
+			foreach ($ipv6 as $ipv6_part)
+			{
 				// The section can't be empty
-				if ($ipv6_part === '') {
+				if ($ipv6_part === '')
+				{
 					return false;
 				}
 
 				// Nor can it be over four characters
-				if (strlen($ipv6_part) > 4) {
+				if (strlen($ipv6_part) > 4)
+				{
 					return false;
 				}
 
 				// Remove leading zeros (this is safe because of the above)
 				$ipv6_part = ltrim($ipv6_part, '0');
-				if ($ipv6_part === '') {
+				if ($ipv6_part === '')
+				{
 					$ipv6_part = '0';
 				}
 
 				// Check the value is valid
 				$value = hexdec($ipv6_part);
-				if (dechex($value) !== strtolower($ipv6_part) || $value < 0 || $value > 0xFFFF) {
+				if (dechex($value) !== strtolower($ipv6_part) || $value < 0 || $value > 0xFFFF)
+				{
 					return false;
 				}
 			}
-			if (count($ipv4) === 4) {
-				foreach ($ipv4 as $ipv4_part) {
+			if (count($ipv4) === 4)
+			{
+				foreach ($ipv4 as $ipv4_part)
+				{
 					$value = (int) $ipv4_part;
-					if ((string) $value !== $ipv4_part || $value < 0 || $value > 0xFF) {
+					if ((string) $value !== $ipv4_part || $value < 0 || $value > 0xFF)
+					{
 						return false;
 					}
 				}
 			}
 			return true;
 		}
-		else {
+		else
+		{
 			return false;
 		}
 	}

php/Requests/libary/Requests/Response/Headers.php

Braces +22 added lines, -11 removed lines

@@ -10,7 +10,8 @@ 
  *
  * @package Requests
  */
-class Requests_Response_Headers extends Requests_Utility_CaseInsensitiveDictionary {
+class Requests_Response_Headers extends Requests_Utility_CaseInsensitiveDictionary
+{
 	/**
 	 * Get the given header
 	 *
@@ -23,9 +24,11 @@ 
 	 * @param string $key
 	 * @return string Header value
 	 */
-	public function offsetGet($key) {
+	public function offsetGet($key)
+	{
 		$key = strtolower($key);
-		if (!isset($this->data[$key])) {
+		if (!isset($this->data[$key]))
+		{
 			return null;
 		}
 
@@ -40,14 +43,17 @@ 
 	 * @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');
 		}
 
 		$key = strtolower($key);
 
-		if (!isset($this->data[$key])) {
+		if (!isset($this->data[$key]))
+		{
 			$this->data[$key] = array();
 		}
 
@@ -60,9 +66,11 @@ 
 	 * @param string $key
 	 * @return array Header values
 	 */
-	public function getValues($key) {
+	public function getValues($key)
+	{
 		$key = strtolower($key);
-		if (!isset($this->data[$key])) {
+		if (!isset($this->data[$key]))
+		{
 			return null;
 		}
 
@@ -78,8 +86,10 @@ 
 	 * @param string|array $value Value to flatten
 	 * @return string Flattened value
 	 */
-	public function flatten($value) {
-		if (is_array($value)) {
+	public function flatten($value)
+	{
+		if (is_array($value))
+		{
 			$value = implode(',', $value);
 		}
 
@@ -92,7 +102,8 @@ 
 	 * Converts the internal
 	 * @return ArrayIterator
 	 */
-	public function getIterator() {
+	public function getIterator()
+	{
 		return new Requests_Utility_FilteredIterator($this->data, array($this, 'flatten'));
 	}
 }

php/Requests/libary/Requests/Response.php

Braces +14 added lines, -7 removed lines

@@ -12,11 +12,13 @@ 
  * Contains a response from Requests::request()
  * @package Requests
  */
-class Requests_Response {
+class Requests_Response
+{
 	/**
 	 * Constructor
 	 */
-	public function __construct() {
+	public function __construct()
+	{
 		$this->headers = new Requests_Response_Headers();
 		$this->cookies = new Requests_Cookie_Jar();
 	}
@@ -95,7 +97,8 @@ 
 	 *
 	 * @return boolean True if redirect (3xx status), false if not.
 	 */
-	public function is_redirect() {
+	public function is_redirect()
+	{
 		$code = $this->status_code;
 		return in_array($code, array(300, 301, 302, 303, 307)) || $code > 307 && $code < 400;
 	}
@@ -107,13 +110,17 @@ 
 	 * @throws Requests_Exception_HTTP On non-successful status code. Exception class corresponds to code (e.g. {@see Requests_Exception_HTTP_404})
 	 * @param boolean $allow_redirects Set to false to throw on a 3xx as well
 	 */
-	public function throw_for_status($allow_redirects = true) {
-		if ($this->is_redirect()) {
-			if (!$allow_redirects) {
+	public function throw_for_status($allow_redirects = true)
+	{
+		if ($this->is_redirect())
+		{
+			if (!$allow_redirects)
+			{
 				throw new Requests_Exception('Redirection not allowed', 'response.no_redirects', $this);
 			}
 		}
-		elseif (!$this->success) {
+		elseif (!$this->success)
+		{
 			$exception = Requests_Exception_HTTP::get_class($this->status_code);
 			throw new $exception(null, $this);
 		}

php/Requests/libary/Requests/Proxy.php

Braces +2 added lines, -1 removed lines

@@ -20,7 +20,8 @@
  * @subpackage Proxy
  * @since 1.6
  */
-interface Requests_Proxy {
+interface Requests_Proxy
+{
 	/**
 	 * Register hooks as needed
 	 *

php/Requests/libary/Requests/Exception.php

Braces +8 added lines, -4 removed lines

@@ -10,7 +10,8 @@ 
  *
  * @package Requests
  */
-class Requests_Exception extends Exception {
+class Requests_Exception extends Exception
+{
 	/**
 	 * Type of exception
 	 *
@@ -33,7 +34,8 @@ 
 	 * @param mixed $data Associated data
 	 * @param integer $code Exception numerical code, if applicable
 	 */
-	public function __construct($message, $type, $data = null, $code = 0) {
+	public function __construct($message, $type, $data = null, $code = 0)
+	{
 		parent::__construct($message, $code);
 
 		$this->type = $type;
@@ -46,7 +48,8 @@ 
 	 * @codeCoverageIgnore
 	 * @return string
 	 */
-	public function getType() {
+	public function getType()
+	{
 		return $this->type;
 	}
 
@@ -56,7 +59,8 @@ 
 	 * @codeCoverageIgnore
 	 * @return mixed
 	 */
-	public function getData() {
+	public function getData()
+	{
 		return $this->data;
 	}
 }
\ No newline at end of file

php/Requests/libary/Requests/IDNAEncoder.php

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