mmainstreet / jodel-web

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

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 	 * @param mixed $data Associated data
 	 */
 	public function __construct($reason = null, $data = null) {
-		if ($data instanceof Requests_Response) {
+		if($data instanceof Requests_Response) {
 			$this->code = $data->status_code;
 		}
 

php/Requests/libary/Requests/Hooks.php

Spacing +5 added lines, -5 removed lines

@@ -35,10 +35,10 @@ 
 	 * @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])) {
+		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();
 		}
 
@@ -53,12 +53,12 @@ 
 	 * @return boolean Successfulness
 	 */
 	public function dispatch($hook, $parameters = array()) {
-		if (empty($this->hooks[$hook])) {
+		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

Spacing +16 added lines, -16 removed lines

@@ -32,7 +32,7 @@ 
 	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 +40,11 @@ 
 		$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 +54,7 @@ 
 				$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 +62,9 @@ 
 
 		// 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;
 			}
 		}
@@ -94,21 +94,21 @@ 
 		// 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;
 			}
 		}
@@ -126,23 +126,23 @@ 
 	 */
 	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

Spacing +22 added lines, -22 removed lines

@@ -35,28 +35,28 @@ 
 	 * @return string The uncompressed IPv6 address
 	 */
 	public static function uncompress($ip) {
-		if (substr_count($ip, '::') !== 1) {
+		if(substr_count($ip, '::') !== 1) {
 			return $ip;
 		}
 
 		list($ip1, $ip2) = explode('::', $ip);
-		$c1 = ($ip1 === '') ? -1 : substr_count($ip1, ':');
-		$c2 = ($ip2 === '') ? -1 : substr_count($ip2, ':');
+		$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);
 		}
@@ -91,11 +91,11 @@ 
 		$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,7 +104,7 @@ 
 			$ip_parts[0] = substr_replace($ip_parts[0], '::', $pos, $max);
 		}
 
-		if ($ip_parts[1] !== '') {
+		if($ip_parts[1] !== '') {
 			return implode(':', $ip_parts);
 		}
 		else {
@@ -125,7 +125,7 @@ 
 	 * @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) {
+		if(strpos($ip, '.') !== false) {
 			$pos = strrpos($ip, ':');
 			$ipv6_part = substr($ip, 0, $pos);
 			$ipv4_part = substr($ip, $pos + 1);
@@ -149,34 +149,34 @@ 
 		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) {
-					$value = (int) $ipv4_part;
-					if ((string) $value !== $ipv4_part || $value < 0 || $value > 0xFF) {
+			if(count($ipv4) === 4) {
+				foreach($ipv4 as $ipv4_part) {
+					$value = (int)$ipv4_part;
+					if((string)$value !== $ipv4_part || $value < 0 || $value > 0xFF) {
 						return false;
 					}
 				}

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

Spacing +5 added lines, -5 removed lines

@@ -25,7 +25,7 @@ 
 	 */
 	public function offsetGet($key) {
 		$key = strtolower($key);
-		if (!isset($this->data[$key])) {
+		if(!isset($this->data[$key])) {
 			return null;
 		}
 
@@ -41,13 +41,13 @@ 
 	 * @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');
 		}
 
 		$key = strtolower($key);
 
-		if (!isset($this->data[$key])) {
+		if(!isset($this->data[$key])) {
 			$this->data[$key] = array();
 		}
 
@@ -62,7 +62,7 @@ 
 	 */
 	public function getValues($key) {
 		$key = strtolower($key);
-		if (!isset($this->data[$key])) {
+		if(!isset($this->data[$key])) {
 			return null;
 		}
 
@@ -79,7 +79,7 @@ 
 	 * @return string Flattened value
 	 */
 	public function flatten($value) {
-		if (is_array($value)) {
+		if(is_array($value)) {
 			$value = implode(',', $value);
 		}
 

php/Requests/libary/Requests/Response.php

Spacing +3 added lines, -3 removed lines

@@ -108,12 +108,12 @@
 	 * @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) {
+		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/IDNAEncoder.php

Spacing +37 added lines, -37 removed lines

@@ -42,7 +42,7 @@ 
 	 */
 	public static function encode($string) {
 		$parts = explode('.', $string);
-		foreach ($parts as &$part) {
+		foreach($parts as &$part) {
 			$part = self::to_ascii($part);
 		}
 		return implode('.', $parts);
@@ -61,9 +61,9 @@ 
 	 */
 	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 +75,9 @@ 
 
 		// 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 +85,7 @@ 
 		}
 
 		// 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 +96,7 @@ 
 		$string = self::ACE_PREFIX . $string;
 
 		// Step 8: Check size
-		if (strlen($string) < 64) {
+		if(strlen($string) < 64) {
 			return $string;
 		}
 
@@ -141,30 +141,30 @@ 
 		// 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) {
-				$character = ($value & 0x1F) << 6;
+			elseif(($value&0xE0) === 0xC0) {
+				$character = ($value&0x1F) << 6;
 				$length = 2;
 				$remaining = 1;
 			}
 			// Three byte sequence:
-			elseif (($value & 0xF0) === 0xE0) {
-				$character = ($value & 0x0F) << 12;
+			elseif(($value&0xF0) === 0xE0) {
+				$character = ($value&0x0F) << 12;
 				$length = 3;
 				$remaining = 2;
 			}
 			// Four byte sequence:
-			elseif (($value & 0xF8) === 0xF0) {
-				$character = ($value & 0x07) << 18;
+			elseif(($value&0xF8) === 0xF0) {
+				$character = ($value&0x07) << 18;
 				$length = 4;
 				$remaining = 3;
 			}
@@ -173,31 +173,31 @@ 
 				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);
 					}
 
-					$character |= ($value & 0x3F) << (--$remaining * 6);
+					$character |= ($value&0x3F) << (--$remaining * 6);
 				}
 				$position--;
 			}
 
-			if (
+			if(
 				// Non-shortest form sequences are invalid
 				   $length > 1 && $character <= 0x7F
 				|| $length > 2 && $character <= 0x7FF
 				|| $length > 3 && $character <= 0xFFFF
 				// Outside of range of ucschar codepoints
 				// Noncharacters
-				|| ($character & 0xFFFE) === 0xFFFE
+				|| ($character&0xFFFE) === 0xFFFE
 				|| $character >= 0xFDD0 && $character <= 0xFDEF
 				|| (
 					// Everything else not in ucschar
@@ -239,8 +239,8 @@ 
 		$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,7 +249,7 @@ 
 			// 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
@@ -261,12 +261,12 @@ 
 		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 +275,31 @@ 
 #			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 {
 							$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))
@@ -342,7 +342,7 @@ 
 	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
@@ -362,7 +362,7 @@ 
 	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
@@ -375,7 +375,7 @@ 
 		$k = 0;
 #		while delta > ((base - tmin) * tmax) div 2 do begin
 		$max = floor(((self::BOOTSTRAP_BASE - self::BOOTSTRAP_TMIN) * self::BOOTSTRAP_TMAX) / 2);
-		while ($delta > $max) {
+		while($delta > $max) {
 #			let delta = delta div (base - tmin)
 			$delta = floor($delta / (self::BOOTSTRAP_BASE - self::BOOTSTRAP_TMIN));
 #			let k = k + base

php/Requests/libary/Requests/IRI.php

Spacing +120 added lines, -120 removed lines

@@ -153,10 +153,10 @@ 
 	 * @param mixed $value Property value
 	 */
 	public function __set($name, $value) {
-		if (method_exists($this, 'set_' . $name)) {
+		if(method_exists($this, 'set_' . $name)) {
 			call_user_func(array($this, 'set_' . $name), $value);
 		}
-		elseif (
+		elseif(
 			   $name === 'iauthority'
 			|| $name === 'iuserinfo'
 			|| $name === 'ihost'
@@ -179,7 +179,7 @@ 
 		// Also why we use array_key_exists below instead of isset()
 		$props = get_object_vars($this);
 
-		if (
+		if(
 			$name === 'iri' ||
 			$name === 'uri' ||
 			$name === 'iauthority' ||
@@ -188,16 +188,16 @@ 
 			$method = 'get_' . $name;
 			$return = $this->$method();
 		}
-		elseif (array_key_exists($name, $props)) {
+		elseif(array_key_exists($name, $props)) {
 			$return = $this->$name;
 		}
 		// host -> ihost
-		elseif (($prop = 'i' . $name) && array_key_exists($prop, $props)) {
+		elseif(($prop = 'i' . $name) && array_key_exists($prop, $props)) {
 			$name = $prop;
 			$return = $this->$prop;
 		}
 		// ischeme -> scheme
-		elseif (($prop = substr($name, 1)) && array_key_exists($prop, $props)) {
+		elseif(($prop = substr($name, 1)) && array_key_exists($prop, $props)) {
 			$name = $prop;
 			$return = $this->$prop;
 		}
@@ -206,7 +206,7 @@ 
 			$return = null;
 		}
 
-		if ($return === null && isset($this->normalization[$this->scheme][$name])) {
+		if($return === null && isset($this->normalization[$this->scheme][$name])) {
 			return $this->normalization[$this->scheme][$name];
 		}
 		else {
@@ -230,7 +230,7 @@ 
 	 * @param string $name Property name
 	 */
 	public function __unset($name) {
-		if (method_exists($this, 'set_' . $name)) {
+		if(method_exists($this, 'set_' . $name)) {
 			call_user_func(array($this, 'set_' . $name), '');
 		}
 	}
@@ -254,25 +254,25 @@ 
 	 * @return IRI|false
 	 */
 	public static function absolutize($base, $relative) {
-		if (!($relative instanceof Requests_IRI)) {
+		if(!($relative instanceof Requests_IRI)) {
 			$relative = new Requests_IRI($relative);
 		}
-		if (!$relative->is_valid()) {
+		if(!$relative->is_valid()) {
 			return false;
 		}
-		elseif ($relative->scheme !== null) {
+		elseif($relative->scheme !== null) {
 			return clone $relative;
 		}
 
-		if (!($base instanceof Requests_IRI)) {
+		if(!($base instanceof Requests_IRI)) {
 			$base = new Requests_IRI($base);
 		}
-		if ($base->scheme === null || !$base->is_valid()) {
+		if($base->scheme === null || !$base->is_valid()) {
 			return false;
 		}
 
-		if ($relative->get_iri() !== '') {
-			if ($relative->iuserinfo !== null || $relative->ihost !== null || $relative->port !== null) {
+		if($relative->get_iri() !== '') {
+			if($relative->iuserinfo !== null || $relative->ihost !== null || $relative->port !== null) {
 				$target = clone $relative;
 				$target->scheme = $base->scheme;
 			}
@@ -282,14 +282,14 @@ 
 				$target->iuserinfo = $base->iuserinfo;
 				$target->ihost = $base->ihost;
 				$target->port = $base->port;
-				if ($relative->ipath !== '') {
-					if ($relative->ipath[0] === '/') {
+				if($relative->ipath !== '') {
+					if($relative->ipath[0] === '/') {
 						$target->ipath = $relative->ipath;
 					}
-					elseif (($base->iuserinfo !== null || $base->ihost !== null || $base->port !== null) && $base->ipath === '') {
+					elseif(($base->iuserinfo !== null || $base->ihost !== null || $base->port !== null) && $base->ipath === '') {
 						$target->ipath = '/' . $relative->ipath;
 					}
-					elseif (($last_segment = strrpos($base->ipath, '/')) !== false) {
+					elseif(($last_segment = strrpos($base->ipath, '/')) !== false) {
 						$target->ipath = substr($base->ipath, 0, $last_segment + 1) . $relative->ipath;
 					}
 					else {
@@ -300,10 +300,10 @@ 
 				}
 				else {
 					$target->ipath = $base->ipath;
-					if ($relative->iquery !== null) {
+					if($relative->iquery !== null) {
 						$target->iquery = $relative->iquery;
 					}
-					elseif ($base->iquery !== null) {
+					elseif($base->iquery !== null) {
 						$target->iquery = $base->iquery;
 					}
 				}
@@ -327,23 +327,23 @@ 
 	protected function parse_iri($iri) {
 		$iri = trim($iri, "\x20\x09\x0A\x0C\x0D");
 		$has_match = preg_match('/^((?P<scheme>[^:\/?#]+):)?(\/\/(?P<authority>[^\/?#]*))?(?P<path>[^?#]*)(\?(?P<query>[^#]*))?(#(?P<fragment>.*))?$/', $iri, $match);
-		if (!$has_match) {
+		if(!$has_match) {
 			throw new Requests_Exception('Cannot parse supplied IRI', 'iri.cannot_parse', $iri);
 		}
 
-		if ($match[1] === '') {
+		if($match[1] === '') {
 			$match['scheme'] = null;
 		}
-		if (!isset($match[3]) || $match[3] === '') {
+		if(!isset($match[3]) || $match[3] === '') {
 			$match['authority'] = null;
 		}
-		if (!isset($match[5])) {
+		if(!isset($match[5])) {
 			$match['path'] = '';
 		}
-		if (!isset($match[6]) || $match[6] === '') {
+		if(!isset($match[6]) || $match[6] === '') {
 			$match['query'] = null;
 		}
-		if (!isset($match[8]) || $match[8] === '') {
+		if(!isset($match[8]) || $match[8] === '') {
 			$match['fragment'] = null;
 		}
 		return $match;
@@ -357,46 +357,46 @@ 
 	 */
 	protected function remove_dot_segments($input) {
 		$output = '';
-		while (strpos($input, './') !== false || strpos($input, '/.') !== false || $input === '.' || $input === '..') {
+		while(strpos($input, './') !== false || strpos($input, '/.') !== false || $input === '.' || $input === '..') {
 			// A: If the input buffer begins with a prefix of "../" or "./",
 			// then remove that prefix from the input buffer; otherwise,
-			if (strpos($input, '../') === 0) {
+			if(strpos($input, '../') === 0) {
 				$input = substr($input, 3);
 			}
-			elseif (strpos($input, './') === 0) {
+			elseif(strpos($input, './') === 0) {
 				$input = substr($input, 2);
 			}
 			// B: if the input buffer begins with a prefix of "/./" or "/.",
 			// where "." is a complete path segment, then replace that prefix
 			// with "/" in the input buffer; otherwise,
-			elseif (strpos($input, '/./') === 0) {
+			elseif(strpos($input, '/./') === 0) {
 				$input = substr($input, 2);
 			}
-			elseif ($input === '/.') {
+			elseif($input === '/.') {
 				$input = '/';
 			}
 			// C: if the input buffer begins with a prefix of "/../" or "/..",
 			// where ".." is a complete path segment, then replace that prefix
 			// with "/" in the input buffer and remove the last segment and its
 			// preceding "/" (if any) from the output buffer; otherwise,
-			elseif (strpos($input, '/../') === 0) {
+			elseif(strpos($input, '/../') === 0) {
 				$input = substr($input, 3);
 				$output = substr_replace($output, '', strrpos($output, '/'));
 			}
-			elseif ($input === '/..') {
+			elseif($input === '/..') {
 				$input = '/';
 				$output = substr_replace($output, '', strrpos($output, '/'));
 			}
 			// D: if the input buffer consists only of "." or "..", then remove
 			// that from the input buffer; otherwise,
-			elseif ($input === '.' || $input === '..') {
+			elseif($input === '.' || $input === '..') {
 				$input = '';
 			}
 			// E: move the first path segment in the input buffer to the end of
 			// the output buffer, including the initial "/" character (if any)
 			// and any subsequent characters up to, but not including, the next
 			// "/" character or the end of the input buffer
-			elseif (($pos = strpos($input, '/', 1)) !== false) {
+			elseif(($pos = strpos($input, '/', 1)) !== false) {
 				$output .= substr($input, 0, $pos);
 				$input = substr_replace($input, '', 0, $pos);
 			}
@@ -431,7 +431,7 @@ 
 		// Now replace any bytes that aren't allowed with their pct-encoded versions
 		$position = 0;
 		$strlen = strlen($string);
-		while (($position += strspn($string, $extra_chars, $position)) < $strlen) {
+		while(($position += strspn($string, $extra_chars, $position)) < $strlen) {
 			$value = ord($string[$position]);
 
 			// Start position
@@ -442,20 +442,20 @@ 
 
 			// No one byte sequences are valid due to the while.
 			// Two byte sequence:
-			if (($value & 0xE0) === 0xC0) {
-				$character = ($value & 0x1F) << 6;
+			if(($value&0xE0) === 0xC0) {
+				$character = ($value&0x1F) << 6;
 				$length = 2;
 				$remaining = 1;
 			}
 			// Three byte sequence:
-			elseif (($value & 0xF0) === 0xE0) {
-				$character = ($value & 0x0F) << 12;
+			elseif(($value&0xF0) === 0xE0) {
+				$character = ($value&0x0F) << 12;
 				$length = 3;
 				$remaining = 2;
 			}
 			// Four byte sequence:
-			elseif (($value & 0xF8) === 0xF0) {
-				$character = ($value & 0x07) << 18;
+			elseif(($value&0xF8) === 0xF0) {
+				$character = ($value&0x07) << 18;
 				$length = 4;
 				$remaining = 3;
 			}
@@ -466,14 +466,14 @@ 
 				$remaining = 0;
 			}
 
-			if ($remaining) {
-				if ($position + $length <= $strlen) {
-					for ($position++; $remaining; $position++) {
+			if($remaining) {
+				if($position + $length <= $strlen) {
+					for($position++; $remaining; $position++) {
 						$value = ord($string[$position]);
 
 						// Check that the byte is valid, then add it to the character:
-						if (($value & 0xC0) === 0x80) {
-							$character |= ($value & 0x3F) << (--$remaining * 6);
+						if(($value&0xC0) === 0x80) {
+							$character |= ($value&0x3F) << (--$remaining * 6);
 						}
 						// If it is invalid, count the sequence as invalid and reprocess the current byte:
 						else {
@@ -490,7 +490,7 @@ 
 			}
 
 			// Percent encode anything invalid or not in ucschar
-			if (
+			if(
 				// Invalid sequences
 				!$valid
 				// Non-shortest form sequences are invalid
@@ -499,7 +499,7 @@ 
 				|| $length > 3 && $character <= 0xFFFF
 				// Outside of range of ucschar codepoints
 				// Noncharacters
-				|| ($character & 0xFFFE) === 0xFFFE
+				|| ($character&0xFFFE) === 0xFFFE
 				|| $character >= 0xFDD0 && $character <= 0xFDEF
 				|| (
 					// Everything else not in ucschar
@@ -515,11 +515,11 @@ 
 				)
 			) {
 				// If we were a character, pretend we weren't, but rather an error.
-				if ($valid) {
+				if($valid) {
 					$position--;
 				}
 
-				for ($j = $start; $j <= $position; $j++) {
+				for($j = $start; $j <= $position; $j++) {
 					$string = substr_replace($string, sprintf('%%%02X', ord($string[$j])), $j, 1);
 					$j += 2;
 					$position += 2;
@@ -552,11 +552,11 @@ 
 		$remaining = 0;
 
 		// Loop over each and every byte, and set $value to its value
-		for ($i = 1, $len = count($bytes); $i < $len; $i++) {
+		for($i = 1, $len = count($bytes); $i < $len; $i++) {
 			$value = hexdec($bytes[$i]);
 
 			// If we're the first byte of sequence:
-			if (!$remaining) {
+			if(!$remaining) {
 				// Start position
 				$start = $i;
 
@@ -564,25 +564,25 @@ 
 				$valid = true;
 
 				// One byte sequence:
-				if ($value <= 0x7F) {
+				if($value <= 0x7F) {
 					$character = $value;
 					$length = 1;
 				}
 				// Two byte sequence:
-				elseif (($value & 0xE0) === 0xC0) {
-					$character = ($value & 0x1F) << 6;
+				elseif(($value&0xE0) === 0xC0) {
+					$character = ($value&0x1F) << 6;
 					$length = 2;
 					$remaining = 1;
 				}
 				// Three byte sequence:
-				elseif (($value & 0xF0) === 0xE0) {
-					$character = ($value & 0x0F) << 12;
+				elseif(($value&0xF0) === 0xE0) {
+					$character = ($value&0x0F) << 12;
 					$length = 3;
 					$remaining = 2;
 				}
 				// Four byte sequence:
-				elseif (($value & 0xF8) === 0xF0) {
-					$character = ($value & 0x07) << 18;
+				elseif(($value&0xF8) === 0xF0) {
+					$character = ($value&0x07) << 18;
 					$length = 4;
 					$remaining = 3;
 				}
@@ -595,9 +595,9 @@ 
 			// Continuation byte:
 			else {
 				// Check that the byte is valid, then add it to the character:
-				if (($value & 0xC0) === 0x80) {
+				if(($value&0xC0) === 0x80) {
 					$remaining--;
-					$character |= ($value & 0x3F) << ($remaining * 6);
+					$character |= ($value&0x3F) << ($remaining * 6);
 				}
 				// If it is invalid, count the sequence as invalid and reprocess the current byte as the start of a sequence:
 				else {
@@ -608,9 +608,9 @@ 
 			}
 
 			// If we've reached the end of the current byte sequence, append it to Unicode::$data
-			if (!$remaining) {
+			if(!$remaining) {
 				// Percent encode anything invalid or not in iunreserved
-				if (
+				if(
 					// Invalid sequences
 					!$valid
 					// Non-shortest form sequences are invalid
@@ -621,7 +621,7 @@ 
 					|| $character < 0x2D
 					|| $character > 0xEFFFD
 					// Noncharacters
-					|| ($character & 0xFFFE) === 0xFFFE
+					|| ($character&0xFFFE) === 0xFFFE
 					|| $character >= 0xFDD0 && $character <= 0xFDEF
 					// Everything else not in iunreserved (this is all BMP)
 					|| $character === 0x2F
@@ -631,12 +631,12 @@ 
 					|| $character > 0x7E && $character < 0xA0
 					|| $character > 0xD7FF && $character < 0xF900
 				) {
-					for ($j = $start; $j <= $i; $j++) {
+					for($j = $start; $j <= $i; $j++) {
 						$string .= '%' . strtoupper($bytes[$j]);
 					}
 				}
 				else {
-					for ($j = $start; $j <= $i; $j++) {
+					for($j = $start; $j <= $i; $j++) {
 						$string .= chr(hexdec($bytes[$j]));
 					}
 				}
@@ -645,8 +645,8 @@ 
 
 		// If we have any bytes left over they are invalid (i.e., we are
 		// mid-way through a multi-byte sequence)
-		if ($remaining) {
-			for ($j = $start; $j < $len; $j++) {
+		if($remaining) {
+			for($j = $start; $j < $len; $j++) {
 				$string .= '%' . strtoupper($bytes[$j]);
 			}
 		}
@@ -655,25 +655,25 @@ 
 	}
 
 	protected function scheme_normalization() {
-		if (isset($this->normalization[$this->scheme]['iuserinfo']) && $this->iuserinfo === $this->normalization[$this->scheme]['iuserinfo']) {
+		if(isset($this->normalization[$this->scheme]['iuserinfo']) && $this->iuserinfo === $this->normalization[$this->scheme]['iuserinfo']) {
 			$this->iuserinfo = null;
 		}
-		if (isset($this->normalization[$this->scheme]['ihost']) && $this->ihost === $this->normalization[$this->scheme]['ihost']) {
+		if(isset($this->normalization[$this->scheme]['ihost']) && $this->ihost === $this->normalization[$this->scheme]['ihost']) {
 			$this->ihost = null;
 		}
-		if (isset($this->normalization[$this->scheme]['port']) && $this->port === $this->normalization[$this->scheme]['port']) {
+		if(isset($this->normalization[$this->scheme]['port']) && $this->port === $this->normalization[$this->scheme]['port']) {
 			$this->port = null;
 		}
-		if (isset($this->normalization[$this->scheme]['ipath']) && $this->ipath === $this->normalization[$this->scheme]['ipath']) {
+		if(isset($this->normalization[$this->scheme]['ipath']) && $this->ipath === $this->normalization[$this->scheme]['ipath']) {
 			$this->ipath = '';
 		}
-		if (isset($this->ihost) && empty($this->ipath)) {
+		if(isset($this->ihost) && empty($this->ipath)) {
 			$this->ipath = '/';
 		}
-		if (isset($this->normalization[$this->scheme]['iquery']) && $this->iquery === $this->normalization[$this->scheme]['iquery']) {
+		if(isset($this->normalization[$this->scheme]['iquery']) && $this->iquery === $this->normalization[$this->scheme]['iquery']) {
 			$this->iquery = null;
 		}
-		if (isset($this->normalization[$this->scheme]['ifragment']) && $this->ifragment === $this->normalization[$this->scheme]['ifragment']) {
+		if(isset($this->normalization[$this->scheme]['ifragment']) && $this->ifragment === $this->normalization[$this->scheme]['ifragment']) {
 			$this->ifragment = null;
 		}
 	}
@@ -686,14 +686,14 @@ 
 	 */
 	public function is_valid() {
 		$isauthority = $this->iuserinfo !== null || $this->ihost !== null || $this->port !== null;
-		if ($this->ipath !== '' &&
+		if($this->ipath !== '' &&
 			(
 				$isauthority && $this->ipath[0] !== '/' ||
 				(
 					$this->scheme === null &&
 					!$isauthority &&
 					strpos($this->ipath, ':') !== false &&
-					(strpos($this->ipath, '/') === false ? true : strpos($this->ipath, ':') < strpos($this->ipath, '/'))
+					(strpos($this->ipath, '/') === false?true : strpos($this->ipath, ':') < strpos($this->ipath, '/'))
 				)
 			)
 		) {
@@ -712,14 +712,14 @@ 
 	 */
 	protected function set_iri($iri) {
 		static $cache;
-		if (!$cache) {
+		if(!$cache) {
 			$cache = array();
 		}
 
-		if ($iri === null) {
+		if($iri === null) {
 			return true;
 		}
-		if (isset($cache[$iri])) {
+		if(isset($cache[$iri])) {
 			list($this->scheme,
 				 $this->iuserinfo,
 				 $this->ihost,
@@ -731,7 +731,7 @@ 
 			return $return;
 		}
 
-		$parsed = $this->parse_iri((string) $iri);
+		$parsed = $this->parse_iri((string)$iri);
 
 		$return = $this->set_scheme($parsed['scheme'])
 			&& $this->set_authority($parsed['authority'])
@@ -758,10 +758,10 @@ 
 	 * @return bool
 	 */
 	protected function set_scheme($scheme) {
-		if ($scheme === null) {
+		if($scheme === null) {
 			$this->scheme = null;
 		}
-		elseif (!preg_match('/^[A-Za-z][0-9A-Za-z+\-.]*$/', $scheme)) {
+		elseif(!preg_match('/^[A-Za-z][0-9A-Za-z+\-.]*$/', $scheme)) {
 			$this->scheme = null;
 			return false;
 		}
@@ -780,17 +780,17 @@ 
 	 */
 	protected function set_authority($authority) {
 		static $cache;
-		if (!$cache) {
+		if(!$cache) {
 			$cache = array();
 		}
 
-		if ($authority === null) {
+		if($authority === null) {
 			$this->iuserinfo = null;
 			$this->ihost = null;
 			$this->port = null;
 			return true;
 		}
-		if (isset($cache[$authority])) {
+		if(isset($cache[$authority])) {
 			list($this->iuserinfo,
 				 $this->ihost,
 				 $this->port,
@@ -800,16 +800,16 @@ 
 		}
 
 		$remaining = $authority;
-		if (($iuserinfo_end = strrpos($remaining, '@')) !== false) {
+		if(($iuserinfo_end = strrpos($remaining, '@')) !== false) {
 			$iuserinfo = substr($remaining, 0, $iuserinfo_end);
 			$remaining = substr($remaining, $iuserinfo_end + 1);
 		}
 		else {
 			$iuserinfo = null;
 		}
-		if (($port_start = strpos($remaining, ':', strpos($remaining, ']'))) !== false) {
+		if(($port_start = strpos($remaining, ':', strpos($remaining, ']'))) !== false) {
 			$port = substr($remaining, $port_start + 1);
-			if ($port === false || $port === '') {
+			if($port === false || $port === '') {
 				$port = null;
 			}
 			$remaining = substr($remaining, 0, $port_start);
@@ -837,7 +837,7 @@ 
 	 * @return bool
 	 */
 	protected function set_userinfo($iuserinfo) {
-		if ($iuserinfo === null) {
+		if($iuserinfo === null) {
 			$this->iuserinfo = null;
 		}
 		else {
@@ -856,12 +856,12 @@ 
 	 * @return bool
 	 */
 	protected function set_host($ihost) {
-		if ($ihost === null) {
+		if($ihost === null) {
 			$this->ihost = null;
 			return true;
 		}
-		if (substr($ihost, 0, 1) === '[' && substr($ihost, -1) === ']') {
-			if (Requests_IPv6::check_ipv6(substr($ihost, 1, -1))) {
+		if(substr($ihost, 0, 1) === '[' && substr($ihost, -1) === ']') {
+			if(Requests_IPv6::check_ipv6(substr($ihost, 1, -1))) {
 				$this->ihost = '[' . Requests_IPv6::compress(substr($ihost, 1, -1)) . ']';
 			}
 			else {
@@ -877,8 +877,8 @@ 
 			// as that can add unescaped characters.
 			$position = 0;
 			$strlen = strlen($ihost);
-			while (($position += strcspn($ihost, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ%', $position)) < $strlen) {
-				if ($ihost[$position] === '%') {
+			while(($position += strcspn($ihost, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ%', $position)) < $strlen) {
+				if($ihost[$position] === '%') {
 					$position += 3;
 				}
 				else {
@@ -903,13 +903,13 @@ 
 	 * @return bool
 	 */
 	protected function set_port($port) {
-		if ($port === null) {
+		if($port === null) {
 			$this->port = null;
 			return true;
 		}
 
-		if (strspn($port, '0123456789') === strlen($port)) {
-			$this->port = (int) $port;
+		if(strspn($port, '0123456789') === strlen($port)) {
+			$this->port = (int)$port;
 			$this->scheme_normalization();
 			return true;
 		}
@@ -926,21 +926,21 @@ 
 	 */
 	protected function set_path($ipath) {
 		static $cache;
-		if (!$cache) {
+		if(!$cache) {
 			$cache = array();
 		}
 
-		$ipath = (string) $ipath;
+		$ipath = (string)$ipath;
 
-		if (isset($cache[$ipath])) {
-			$this->ipath = $cache[$ipath][(int) ($this->scheme !== null)];
+		if(isset($cache[$ipath])) {
+			$this->ipath = $cache[$ipath][(int)($this->scheme !== null)];
 		}
 		else {
 			$valid = $this->replace_invalid_with_pct_encoding($ipath, '!$&\'()*+,;=@:/');
 			$removed = $this->remove_dot_segments($valid);
 
 			$cache[$ipath] = array($valid, $removed);
-			$this->ipath = ($this->scheme !== null) ? $removed : $valid;
+			$this->ipath = ($this->scheme !== null)?$removed : $valid;
 		}
 		$this->scheme_normalization();
 		return true;
@@ -953,7 +953,7 @@ 
 	 * @return bool
 	 */
 	protected function set_query($iquery) {
-		if ($iquery === null) {
+		if($iquery === null) {
 			$this->iquery = null;
 		}
 		else {
@@ -970,7 +970,7 @@ 
 	 * @return bool
 	 */
 	protected function set_fragment($ifragment) {
-		if ($ifragment === null) {
+		if($ifragment === null) {
 			$this->ifragment = null;
 		}
 		else {
@@ -987,18 +987,18 @@ 
 	 * @return string|false URI if IRI is valid, false otherwise.
 	 */
 	protected function to_uri($string) {
-		if (!is_string($string)) {
+		if(!is_string($string)) {
 			return false;
 		}
 
 		static $non_ascii;
-		if (!$non_ascii) {
+		if(!$non_ascii) {
 			$non_ascii = implode('', range("\x80", "\xFF"));
 		}
 
 		$position = 0;
 		$strlen = strlen($string);
-		while (($position += strcspn($string, $non_ascii, $position)) < $strlen) {
+		while(($position += strcspn($string, $non_ascii, $position)) < $strlen) {
 			$string = substr_replace($string, sprintf('%%%02X', ord($string[$position])), $position, 1);
 			$position += 3;
 			$strlen += 2;
@@ -1013,22 +1013,22 @@ 
 	 * @return string
 	 */
 	protected function get_iri() {
-		if (!$this->is_valid()) {
+		if(!$this->is_valid()) {
 			return false;
 		}
 
 		$iri = '';
-		if ($this->scheme !== null) {
+		if($this->scheme !== null) {
 			$iri .= $this->scheme . ':';
 		}
-		if (($iauthority = $this->get_iauthority()) !== null) {
+		if(($iauthority = $this->get_iauthority()) !== null) {
 			$iri .= '//' . $iauthority;
 		}
 		$iri .= $this->ipath;
-		if ($this->iquery !== null) {
+		if($this->iquery !== null) {
 			$iri .= '?' . $this->iquery;
 		}
-		if ($this->ifragment !== null) {
+		if($this->ifragment !== null) {
 			$iri .= '#' . $this->ifragment;
 		}
 
@@ -1050,18 +1050,18 @@ 
 	 * @return string
 	 */
 	protected function get_iauthority() {
-		if ($this->iuserinfo === null && $this->ihost === null && $this->port === null) {
+		if($this->iuserinfo === null && $this->ihost === null && $this->port === null) {
 			return null;
 		}
 
 		$iauthority = '';
-		if ($this->iuserinfo !== null) {
+		if($this->iuserinfo !== null) {
 			$iauthority .= $this->iuserinfo . '@';
 		}
-		if ($this->ihost !== null) {
+		if($this->ihost !== null) {
 			$iauthority .= $this->ihost;
 		}
-		if ($this->port !== null) {
+		if($this->port !== null) {
 			$iauthority .= ':' . $this->port;
 		}
 		return $iauthority;
@@ -1074,7 +1074,7 @@ 
 	 */
 	protected function get_authority() {
 		$iauthority = $this->get_iauthority();
-		if (is_string($iauthority)) {
+		if(is_string($iauthority)) {
 			return $this->to_uri($iauthority);
 		}
 		else {

php/Requests/libary/Requests/Auth/Basic.php

Spacing +3 added lines, -3 removed lines

@@ -37,8 +37,8 @@ 
 	 * @param array|null $args Array of user and password. Must have exactly two elements
 	 */
 	public function __construct($args = null) {
-		if (is_array($args)) {
-			if (count($args) !== 2) {
+		if(is_array($args)) {
+			if(count($args) !== 2) {
 				throw new Requests_Exception('Invalid number of arguments', 'authbasicbadargs');
 			}
 
@@ -53,7 +53,7 @@ 
 	 * @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.after_headers', array(&$this, 'fsockopen_header'));
 	}