mmainstreet / jodel-web

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

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

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

@@ -32,12 +32,12 @@ 
 	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);
 
-		$has_dns_alt = false;
+		$has_dns_alt = FALSE;
 
 		// Check the subjectAltName
 		if (!empty($cert['extensions']) && !empty($cert['extensions']['subjectAltName'])) {
@@ -48,14 +48,14 @@ 
 					continue;
 				}
 
-				$has_dns_alt = true;
+				$has_dns_alt = TRUE;
 
 				// Strip the 'DNS:' prefix and trim whitespace
 				$altname = trim(substr($altname, 4));
 
 				// Check for a match
-				if (self::match_domain($host, $altname) === true) {
-					return true;
+				if (self::match_domain($host, $altname) === TRUE) {
+					return TRUE;
 				}
 			}
 		}
@@ -64,12 +64,12 @@ 
 		// alt names, as per RFC2818
 		if (!$has_dns_alt && !empty($cert['subject']['CN'])) {
 			// Check for a match
-			if (self::match_domain($host, $cert['subject']['CN']) === true) {
-				return true;
+			if (self::match_domain($host, $cert['subject']['CN']) === TRUE) {
+				return TRUE;
 			}
 		}
 
-		return false;
+		return FALSE;
 	}
 
 	/**
@@ -94,27 +94,27 @@ 
 		// 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 !== '*') {
-				return false;
+				return FALSE;
 			}
 
 			// Check that we have at least 3 components (including first)
 			if (count($parts) < 2) {
-				return false;
+				return FALSE;
 			}
 		}
 
 		// Check the remaining parts
 		foreach ($parts as $part) {
-			if (strpos($part, '*') !== false) {
-				return false;
+			if (strpos($part, '*') !== FALSE) {
+				return FALSE;
 			}
 		}
 
 		// Nothing found, verified!
-		return true;
+		return TRUE;
 	}
 
 	/**
@@ -126,27 +126,27 @@ 
 	 */
 	public static function match_domain($host, $reference) {
 		// Check if the reference is blacklisted first
-		if (self::verify_reference_name($reference) !== true) {
-			return false;
+		if (self::verify_reference_name($reference) !== TRUE) {
+			return FALSE;
 		}
 
 		// Check for a direct match
 		if ($host === $reference) {
-			return true;
+			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) {
-				return true;
+				return TRUE;
 			}
 		}
 
-		return false;
+		return FALSE;
 	}
 }
\ No newline at end of file

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

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

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

@@ -43,7 +43,7 @@ 
 		$c1 = ($ip1 === '') ? -1 : substr_count($ip1, ':');
 		$c2 = ($ip2 === '') ? -1 : substr_count($ip2, ':');
 
-		if (strpos($ip2, '.') !== false) {
+		if (strpos($ip2, '.') !== FALSE) {
 			$c2++;
 		}
 		// ::
@@ -93,7 +93,7 @@ 
 		// Find bunches of zeros
 		if (preg_match_all('/(?:^|:)(?:0(?::|$))+/', $ip_parts[0], $matches, PREG_OFFSET_CAPTURE)) {
 			$max = 0;
-			$pos = null;
+			$pos = NULL;
 			foreach ($matches[0] as $match) {
 				if (strlen($match[0]) > $max) {
 					$max = strlen($match[0]);
@@ -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);
@@ -153,12 +153,12 @@ 
 			foreach ($ipv6 as $ipv6_part) {
 				// The section can't be empty
 				if ($ipv6_part === '') {
-					return false;
+					return FALSE;
 				}
 
 				// Nor can it be over four characters
 				if (strlen($ipv6_part) > 4) {
-					return false;
+					return FALSE;
 				}
 
 				// Remove leading zeros (this is safe because of the above)
@@ -170,21 +170,21 @@ 
 				// Check the value is valid
 				$value = hexdec($ipv6_part);
 				if (dechex($value) !== strtolower($ipv6_part) || $value < 0 || $value > 0xFFFF) {
-					return false;
+					return FALSE;
 				}
 			}
 			if (count($ipv4) === 4) {
 				foreach ($ipv4 as $ipv4_part) {
 					$value = (int) $ipv4_part;
 					if ((string) $value !== $ipv4_part || $value < 0 || $value > 0xFF) {
-						return false;
+						return FALSE;
 					}
 				}
 			}
-			return true;
+			return TRUE;
 		}
 		else {
-			return false;
+			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);
 		}
 

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

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

@@ -26,7 +26,7 @@ 
 	public function offsetGet($key) {
 		$key = strtolower($key);
 		if (!isset($this->data[$key])) {
-			return null;
+			return NULL;
 		}
 
 		return $this->flatten($this->data[$key]);
@@ -41,7 +41,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');
 		}
 
@@ -63,7 +63,7 @@ 
 	public function getValues($key) {
 		$key = strtolower($key);
 		if (!isset($this->data[$key])) {
-			return null;
+			return NULL;
 		}
 
 		return $this->data[$key];

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

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

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

@@ -47,20 +47,20 @@ 
 	 *
 	 * @var integer|boolean
 	 */
-	public $status_code = false;
+	public $status_code = FALSE;
 
 	/**
 	 * Protocol version, false if non-blocking
 	 * @var float|boolean
 	 */
-	public $protocol_version = false;
+	public $protocol_version = FALSE;
 
 	/**
 	 * Whether the request succeeded or not
 	 *
 	 * @var boolean
 	 */
-	public $success = false;
+	public $success = FALSE;
 
 	/**
 	 * Number of redirects the request used
@@ -107,7 +107,7 @@ 
 	 * @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) {
+	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);
@@ -115,7 +115,7 @@ 
 		}
 		elseif (!$this->success) {
 			$exception = Requests_Exception_HTTP::get_class($this->status_code);
-			throw new $exception(null, $this);
+			throw new $exception(NULL, $this);
 		}
 	}
 }

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

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

@@ -33,7 +33,7 @@
 	 * @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;

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

Braces +16 added lines, -8 removed lines

@@ -15,7 +15,8 @@ 
  * @package Requests
  * @subpackage Authentication
  */
-class Requests_Auth_Basic implements Requests_Auth {
+class Requests_Auth_Basic implements Requests_Auth
+{
 	/**
 	 * Username
 	 *
@@ -36,9 +37,12 @@ 
 	 * @throws Requests_Exception On incorrect number of arguments (`authbasicbadargs`)
 	 * @param array|null $args Array of user and password. Must have exactly two elements
 	 */
-	public function __construct($args = null) {
-		if (is_array($args)) {
-			if (count($args) !== 2) {
+	public function __construct($args = null)
+	{
+		if (is_array($args))
+		{
+			if (count($args) !== 2)
+			{
 				throw new Requests_Exception('Invalid number of arguments', 'authbasicbadargs');
 			}
 
@@ -53,7 +57,8 @@ 
 	 * @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'));
 	}
@@ -63,7 +68,8 @@ 
 	 *
 	 * @param resource $handle cURL resource
 	 */
-	public function curl_before_send(&$handle) {
+	public function curl_before_send(&$handle)
+	{
 		curl_setopt($handle, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
 		curl_setopt($handle, CURLOPT_USERPWD, $this->getAuthString());
 	}
@@ -73,7 +79,8 @@ 
 	 *
 	 * @param string $out HTTP header string
 	 */
-	public function fsockopen_header(&$out) {
+	public function fsockopen_header(&$out)
+	{
 		$out .= sprintf("Authorization: Basic %s\r\n", base64_encode($this->getAuthString()));
 	}
 
@@ -82,7 +89,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getAuthString() {
+	public function getAuthString()
+	{
 		return $this->user . ':' . $this->pass;
 	}
 }
\ No newline at end of file

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

@@ -36,7 +36,7 @@
 	 * @throws Requests_Exception On incorrect number of arguments (`authbasicbadargs`)
 	 * @param array|null $args Array of user and password. Must have exactly two elements
 	 */
-	public function __construct($args = null) {
+	public function __construct($args = NULL) {
 		if (is_array($args)) {
 			if (count($args) !== 2) {
 				throw new Requests_Exception('Invalid number of arguments', 'authbasicbadargs');

php/Requests/libary/Requests.php

Spacing +89 added lines, -89 removed lines

@@ -137,12 +137,12 @@ 
 	 */
 	public static function autoloader($class) {
 		// Check that the class starts with "Requests"
-		if (strpos($class, 'Requests') !== 0) {
+		if(strpos($class, 'Requests') !== 0) {
 			return;
 		}
 
 		$file = str_replace('_', '/', $class);
-		if (file_exists(dirname(__FILE__) . '/' . $file . '.php')) {
+		if(file_exists(dirname(__FILE__) . '/' . $file . '.php')) {
 			require_once(dirname(__FILE__) . '/' . $file . '.php');
 		}
 	}
@@ -162,7 +162,7 @@ 
 	 * @param string $transport Transport class to add, must support the Requests_Transport interface
 	 */
 	public static function add_transport($transport) {
-		if (empty(self::$transports)) {
+		if(empty(self::$transports)) {
 			self::$transports = array(
 				'Requests_Transport_cURL',
 				'Requests_Transport_fsockopen',
@@ -186,12 +186,12 @@ 
 		$cap_string = serialize($capabilities);
 
 		// Don't search for a transport if it's already been done for these $capabilities
-		if (isset(self::$transport[$cap_string]) && self::$transport[$cap_string] !== null) {
+		if(isset(self::$transport[$cap_string]) && self::$transport[$cap_string] !== null) {
 			return new self::$transport[$cap_string]();
 		}
 		// @codeCoverageIgnoreEnd
 
-		if (empty(self::$transports)) {
+		if(empty(self::$transports)) {
 			self::$transports = array(
 				'Requests_Transport_cURL',
 				'Requests_Transport_fsockopen',
@@ -199,18 +199,18 @@ 
 		}
 
 		// Find us a working transport
-		foreach (self::$transports as $class) {
-			if (!class_exists($class)) {
+		foreach(self::$transports as $class) {
+			if(!class_exists($class)) {
 				continue;
 			}
 
 			$result = call_user_func(array($class, 'test'), $capabilities);
-			if ($result) {
+			if($result) {
 				self::$transport[$cap_string] = $class;
 				break;
 			}
 		}
-		if (self::$transport[$cap_string] === null) {
+		if(self::$transport[$cap_string] === null) {
 			throw new Requests_Exception('No working transports found', 'notransport', self::$transports);
 		}
 
@@ -355,7 +355,7 @@ 
 	 * @return Requests_Response
 	 */
 	public static function request($url, $headers = array(), $data = array(), $type = self::GET, $options = array()) {
-		if (empty($options['type'])) {
+		if(empty($options['type'])) {
 			$options['type'] = $type;
 		}
 		$options = array_merge(self::get_default_options(), $options);
@@ -364,10 +364,10 @@ 
 
 		$options['hooks']->dispatch('requests.before_request', array(&$url, &$headers, &$data, &$type, &$options));
 
-		if (!empty($options['transport'])) {
+		if(!empty($options['transport'])) {
 			$transport = $options['transport'];
 
-			if (is_string($options['transport'])) {
+			if(is_string($options['transport'])) {
 				$transport = new $transport();
 			}
 		}
@@ -427,29 +427,29 @@ 
 	public static function request_multiple($requests, $options = array()) {
 		$options = array_merge(self::get_default_options(true), $options);
 
-		if (!empty($options['hooks'])) {
+		if(!empty($options['hooks'])) {
 			$options['hooks']->register('transport.internal.parse_response', array('Requests', 'parse_multiple'));
-			if (!empty($options['complete'])) {
+			if(!empty($options['complete'])) {
 				$options['hooks']->register('multiple.request.complete', $options['complete']);
 			}
 		}
 
-		foreach ($requests as $id => &$request) {
-			if (!isset($request['headers'])) {
+		foreach($requests as $id => &$request) {
+			if(!isset($request['headers'])) {
 				$request['headers'] = array();
 			}
-			if (!isset($request['data'])) {
+			if(!isset($request['data'])) {
 				$request['data'] = array();
 			}
-			if (!isset($request['type'])) {
+			if(!isset($request['type'])) {
 				$request['type'] = self::GET;
 			}
-			if (!isset($request['options'])) {
+			if(!isset($request['options'])) {
 				$request['options'] = $options;
 				$request['options']['type'] = $request['type'];
 			}
 			else {
-				if (empty($request['options']['type'])) {
+				if(empty($request['options']['type'])) {
 					$request['options']['type'] = $request['type'];
 				}
 				$request['options'] = array_merge($options, $request['options']);
@@ -458,19 +458,19 @@ 
 			self::set_defaults($request['url'], $request['headers'], $request['data'], $request['type'], $request['options']);
 
 			// Ensure we only hook in once
-			if ($request['options']['hooks'] !== $options['hooks']) {
+			if($request['options']['hooks'] !== $options['hooks']) {
 				$request['options']['hooks']->register('transport.internal.parse_response', array('Requests', 'parse_multiple'));
-				if (!empty($request['options']['complete'])) {
+				if(!empty($request['options']['complete'])) {
 					$request['options']['hooks']->register('multiple.request.complete', $request['options']['complete']);
 				}
 			}
 		}
 		unset($request);
 
-		if (!empty($options['transport'])) {
+		if(!empty($options['transport'])) {
 			$transport = $options['transport'];
 
-			if (is_string($options['transport'])) {
+			if(is_string($options['transport'])) {
 				$transport = new $transport();
 			}
 		}
@@ -479,10 +479,10 @@ 
 		}
 		$responses = $transport->request_multiple($requests, $options);
 
-		foreach ($responses as $id => &$response) {
+		foreach($responses as $id => &$response) {
 			// If our hook got messed with somehow, ensure we end up with the
 			// correct response
-			if (is_string($response)) {
+			if(is_string($response)) {
 				$request = $requests[$id];
 				self::parse_multiple($response, $request);
 				$request['options']['hooks']->dispatch('multiple.request.complete', array(&$response, $id));
@@ -521,7 +521,7 @@ 
 			'verify' => Requests::get_certificate_path(),
 			'verifyname' => true,
 		);
-		if ($multirequest !== false) {
+		if($multirequest !== false) {
 			$defaults['complete'] = null;
 		}
 		return $defaults;
@@ -533,7 +533,7 @@ 
 	 * @return string Default certificate path.
 	 */
 	public static function get_certificate_path() {
-		if ( ! empty( Requests::$certificate_path ) ) {
+		if(!empty(Requests::$certificate_path)) {
 			return Requests::$certificate_path;
 		}
 
@@ -545,7 +545,7 @@ 
 	 *
 	 * @param string $path Certificate path, pointing to a PEM file.
 	 */
-	public static function set_certificate_path( $path ) {
+	public static function set_certificate_path($path) {
 		Requests::$certificate_path = $path;
 	}
 
@@ -560,39 +560,39 @@ 
 	 * @return array $options
 	 */
 	protected static function set_defaults(&$url, &$headers, &$data, &$type, &$options) {
-		if (!preg_match('/^http(s)?:\/\//i', $url, $matches)) {
+		if(!preg_match('/^http(s)?:\/\//i', $url, $matches)) {
 			throw new Requests_Exception('Only HTTP(S) requests are handled.', 'nonhttp', $url);
 		}
 
-		if (empty($options['hooks'])) {
+		if(empty($options['hooks'])) {
 			$options['hooks'] = new Requests_Hooks();
 		}
 
-		if (is_array($options['auth'])) {
+		if(is_array($options['auth'])) {
 			$options['auth'] = new Requests_Auth_Basic($options['auth']);
 		}
-		if ($options['auth'] !== false) {
+		if($options['auth'] !== false) {
 			$options['auth']->register($options['hooks']);
 		}
 
-		if (is_string($options['proxy']) || is_array($options['proxy'])) {
+		if(is_string($options['proxy']) || is_array($options['proxy'])) {
 			$options['proxy'] = new Requests_Proxy_HTTP($options['proxy']);
 		}
-		if ($options['proxy'] !== false) {
+		if($options['proxy'] !== false) {
 			$options['proxy']->register($options['hooks']);
 		}
 
-		if (is_array($options['cookies'])) {
+		if(is_array($options['cookies'])) {
 			$options['cookies'] = new Requests_Cookie_Jar($options['cookies']);
 		}
-		elseif (empty($options['cookies'])) {
+		elseif(empty($options['cookies'])) {
 			$options['cookies'] = new Requests_Cookie_Jar();
 		}
-		if ($options['cookies'] !== false) {
+		if($options['cookies'] !== false) {
 			$options['cookies']->register($options['hooks']);
 		}
 
-		if ($options['idn'] !== false) {
+		if($options['idn'] !== false) {
 			$iri = new Requests_IRI($url);
 			$iri->host = Requests_IDNAEncoder::encode($iri->ihost);
 			$url = $iri->uri;
@@ -601,8 +601,8 @@ 
 		// Massage the type to ensure we support it.
 		$type = strtoupper($type);
 
-		if (!isset($options['data_format'])) {
-			if (in_array($type, array(self::HEAD, self::GET, self::DELETE))) {
+		if(!isset($options['data_format'])) {
+			if(in_array($type, array(self::HEAD, self::GET, self::DELETE))) {
 				$options['data_format'] = 'query';
 			}
 			else {
@@ -627,15 +627,15 @@ 
 	 */
 	protected static function parse_response($headers, $url, $req_headers, $req_data, $options) {
 		$return = new Requests_Response();
-		if (!$options['blocking']) {
+		if(!$options['blocking']) {
 			return $return;
 		}
 
 		$return->raw = $headers;
 		$return->url = $url;
 
-		if (!$options['filename']) {
-			if (($pos = strpos($headers, "\r\n\r\n")) === false) {
+		if(!$options['filename']) {
+			if(($pos = strpos($headers, "\r\n\r\n")) === false) {
 				// Crap!
 				throw new Requests_Exception('Missing header/body separator', 'requests.no_crlf_separator');
 			}
@@ -652,44 +652,44 @@ 
 		$headers = preg_replace('/\n[ \t]/', ' ', $headers);
 		$headers = explode("\n", $headers);
 		preg_match('#^HTTP/(1\.\d)[ \t]+(\d+)#i', array_shift($headers), $matches);
-		if (empty($matches)) {
+		if(empty($matches)) {
 			throw new Requests_Exception('Response could not be parsed', 'noversion', $headers);
 		}
-		$return->protocol_version = (float) $matches[1];
-		$return->status_code = (int) $matches[2];
-		if ($return->status_code >= 200 && $return->status_code < 300) {
+		$return->protocol_version = (float)$matches[1];
+		$return->status_code = (int)$matches[2];
+		if($return->status_code >= 200 && $return->status_code < 300) {
 			$return->success = true;
 		}
 
-		foreach ($headers as $header) {
+		foreach($headers as $header) {
 			list($key, $value) = explode(':', $header, 2);
 			$value = trim($value);
 			preg_replace('#(\s+)#i', ' ', $value);
 			$return->headers[$key] = $value;
 		}
-		if (isset($return->headers['transfer-encoding'])) {
+		if(isset($return->headers['transfer-encoding'])) {
 			$return->body = self::decode_chunked($return->body);
 			unset($return->headers['transfer-encoding']);
 		}
-		if (isset($return->headers['content-encoding'])) {
+		if(isset($return->headers['content-encoding'])) {
 			$return->body = self::decompress($return->body);
 		}
 
 		//fsockopen and cURL compatibility
-		if (isset($return->headers['connection'])) {
+		if(isset($return->headers['connection'])) {
 			unset($return->headers['connection']);
 		}
 
 		$options['hooks']->dispatch('requests.before_redirect_check', array(&$return, $req_headers, $req_data, $options));
 
-		if ($return->is_redirect() && $options['follow_redirects'] === true) {
-			if (isset($return->headers['location']) && $options['redirected'] < $options['redirects']) {
-				if ($return->status_code === 303) {
+		if($return->is_redirect() && $options['follow_redirects'] === true) {
+			if(isset($return->headers['location']) && $options['redirected'] < $options['redirects']) {
+				if($return->status_code === 303) {
 					$options['type'] = self::GET;
 				}
 				$options['redirected']++;
 				$location = $return->headers['location'];
-				if (strpos($location, 'http://') !== 0 && strpos($location, 'https://') !== 0) {
+				if(strpos($location, 'http://') !== 0 && strpos($location, 'https://') !== 0) {
 					// relative redirect, for compatibility make it absolute
 					$location = Requests_IRI::absolutize($url, $location);
 					$location = $location->uri;
@@ -707,7 +707,7 @@ 
 				$redirected->history[] = $return;
 				return $redirected;
 			}
-			elseif ($options['redirected'] >= $options['redirects']) {
+			elseif($options['redirected'] >= $options['redirects']) {
 				throw new Requests_Exception('Too many redirects', 'toomanyredirects', $return);
 			}
 		}
@@ -736,7 +736,7 @@ 
 			$options = $request['options'];
 			$response = self::parse_response($response, $url, $headers, $data, $options);
 		}
-		catch (Requests_Exception $e) {
+		catch(Requests_Exception $e) {
 			$response = $e;
 		}
 	}
@@ -749,7 +749,7 @@ 
 	 * @return string Decoded body
 	 */
 	protected static function decode_chunked($data) {
-		if (!preg_match('/^([0-9a-f]+)(?:;(?:[\w-]*)(?:=(?:(?:[\w-]*)*|"(?:[^\r\n])*"))?)*\r\n/i', trim($data))) {
+		if(!preg_match('/^([0-9a-f]+)(?:;(?:[\w-]*)(?:=(?:(?:[\w-]*)*|"(?:[^\r\n])*"))?)*\r\n/i', trim($data))) {
 			return $data;
 		}
 
@@ -758,15 +758,15 @@ 
 		$decoded = '';
 		$encoded = $data;
 
-		while (true) {
-			$is_chunked = (bool) preg_match('/^([0-9a-f]+)(?:;(?:[\w-]*)(?:=(?:(?:[\w-]*)*|"(?:[^\r\n])*"))?)*\r\n/i', $encoded, $matches);
-			if (!$is_chunked) {
+		while(true) {
+			$is_chunked = (bool)preg_match('/^([0-9a-f]+)(?:;(?:[\w-]*)(?:=(?:(?:[\w-]*)*|"(?:[^\r\n])*"))?)*\r\n/i', $encoded, $matches);
+			if(!$is_chunked) {
 				// Looks like it's not chunked after all
 				return $data;
 			}
 
 			$length = hexdec(trim($matches[1]));
-			if ($length === 0) {
+			if($length === 0) {
 				// Ignore trailer headers
 				return $decoded;
 			}
@@ -775,7 +775,7 @@ 
 			$decoded .= substr($encoded, $chunk_length, $length);
 			$encoded = substr($encoded, $chunk_length + $length + 2);
 
-			if (trim($encoded) === '0' || empty($encoded)) {
+			if(trim($encoded) === '0' || empty($encoded)) {
 				return $decoded;
 			}
 		}
@@ -793,7 +793,7 @@ 
 	 */
 	public static function flatten($array) {
 		$return = array();
-		foreach ($array as $key => $value) {
+		foreach($array as $key => $value) {
 			$return[] = sprintf('%s: %s', $key, $value);
 		}
 		return $return;
@@ -821,21 +821,21 @@ 
 	 * @return string Decompressed string
 	 */
 	public static function decompress($data) {
-		if (substr($data, 0, 2) !== "\x1f\x8b" && substr($data, 0, 2) !== "\x78\x9c") {
+		if(substr($data, 0, 2) !== "\x1f\x8b" && substr($data, 0, 2) !== "\x78\x9c") {
 			// Not actually compressed. Probably cURL ruining this for us.
 			return $data;
 		}
 
-		if (function_exists('gzdecode') && ($decoded = @gzdecode($data)) !== false) {
+		if(function_exists('gzdecode') && ($decoded = @gzdecode($data)) !== false) {
 			return $decoded;
 		}
-		elseif (function_exists('gzinflate') && ($decoded = @gzinflate($data)) !== false) {
+		elseif(function_exists('gzinflate') && ($decoded = @gzinflate($data)) !== false) {
 			return $decoded;
 		}
-		elseif (($decoded = self::compatible_gzinflate($data)) !== false) {
+		elseif(($decoded = self::compatible_gzinflate($data)) !== false) {
 			return $decoded;
 		}
-		elseif (function_exists('gzuncompress') && ($decoded = @gzuncompress($data)) !== false) {
+		elseif(function_exists('gzuncompress') && ($decoded = @gzuncompress($data)) !== false) {
 			return $decoded;
 		}
 
@@ -865,26 +865,26 @@ 
 	public static function compatible_gzinflate($gzData) {
 		// Compressed data might contain a full zlib header, if so strip it for
 		// gzinflate()
-		if (substr($gzData, 0, 3) == "\x1f\x8b\x08") {
+		if(substr($gzData, 0, 3) == "\x1f\x8b\x08") {
 			$i = 10;
 			$flg = ord(substr($gzData, 3, 1));
-			if ($flg > 0) {
-				if ($flg & 4) {
+			if($flg > 0) {
+				if($flg&4) {
 					list($xlen) = unpack('v', substr($gzData, $i, 2));
 					$i = $i + 2 + $xlen;
 				}
-				if ($flg & 8) {
+				if($flg&8) {
 					$i = strpos($gzData, "\0", $i) + 1;
 				}
-				if ($flg & 16) {
+				if($flg&16) {
 					$i = strpos($gzData, "\0", $i) + 1;
 				}
-				if ($flg & 2) {
+				if($flg&2) {
 					$i = $i + 2;
 				}
 			}
 			$decompressed = self::compatible_gzinflate(substr($gzData, $i));
-			if (false !== $decompressed) {
+			if(false !== $decompressed) {
 				return $decompressed;
 			}
 		}
@@ -905,17 +905,17 @@ 
 		// First 2 bytes should be divisible by 0x1F
 		list(, $first_two_bytes) = unpack('n', $gzData);
 
-		if (0x08 == $first_nibble && 0 == ($first_two_bytes % 0x1F)) {
+		if(0x08 == $first_nibble && 0 == ($first_two_bytes % 0x1F)) {
 			$huffman_encoded = true;
 		}
 
-		if ($huffman_encoded) {
-			if (false !== ($decompressed = @gzinflate(substr($gzData, 2)))) {
+		if($huffman_encoded) {
+			if(false !== ($decompressed = @gzinflate(substr($gzData, 2)))) {
 				return $decompressed;
 			}
 		}
 
-		if ("\x50\x4b\x03\x04" == substr($gzData, 0, 4)) {
+		if("\x50\x4b\x03\x04" == substr($gzData, 0, 4)) {
 			// ZIP file format header
 			// Offset 6: 2 bytes, General-purpose field
 			// Offset 26: 2 bytes, filename length
@@ -927,9 +927,9 @@ 
 			// If the file has been compressed on the fly, 0x08 bit is set of
 			// the general purpose field. We can use this to differentiate
 			// between a compressed document, and a ZIP file
-			$zip_compressed_on_the_fly = (0x08 == (0x08 & $general_purpose_flag));
+			$zip_compressed_on_the_fly = (0x08 == (0x08&$general_purpose_flag));
 
-			if (!$zip_compressed_on_the_fly) {
+			if(!$zip_compressed_on_the_fly) {
 				// Don't attempt to decode a compressed zip file
 				return $gzData;
 			}
@@ -937,20 +937,20 @@ 
 			// Determine the first byte of data, based on the above ZIP header
 			// offsets:
 			$first_file_start = array_sum(unpack('v2', substr($gzData, 26, 4)));
-			if (false !== ($decompressed = @gzinflate(substr($gzData, 30 + $first_file_start)))) {
+			if(false !== ($decompressed = @gzinflate(substr($gzData, 30 + $first_file_start)))) {
 				return $decompressed;
 			}
 			return false;
 		}
 
 		// Finally fall back to straight gzinflate
-		if (false !== ($decompressed = @gzinflate($gzData))) {
+		if(false !== ($decompressed = @gzinflate($gzData))) {
 			return $decompressed;
 		}
 
 		// Fallback for all above failing, not expected, but included for
 		// debugging and preventing regressions and to track stats
-		if (false !== ($decompressed = @gzinflate(substr($gzData, 2)))) {
+		if(false !== ($decompressed = @gzinflate(substr($gzData, 2)))) {
 			return $decompressed;
 		}
 
@@ -959,7 +959,7 @@ 
 
 	public static function match_domain($host, $reference) {
 		// Check for a direct match
-		if ($host === $reference) {
+		if($host === $reference) {
 			return true;
 		}
 
@@ -967,10 +967,10 @@ 
 		// Also validates that the host has 3 parts or more, as per Firefox's
 		// ruleset.
 		$parts = explode('.', $host);
-		if (ip2long($host) === false && count($parts) >= 3) {
+		if(ip2long($host) === false && count($parts) >= 3) {
 			$parts[0] = '*';
 			$wildcard = implode('.', $parts);
-			if ($wildcard === $reference) {
+			if($wildcard === $reference) {
 				return true;
 			}
 		}

Braces +237 added lines, -118 removed lines

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

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

@@ -186,7 +186,7 @@ 
 		$cap_string = serialize($capabilities);
 
 		// Don't search for a transport if it's already been done for these $capabilities
-		if (isset(self::$transport[$cap_string]) && self::$transport[$cap_string] !== null) {
+		if (isset(self::$transport[$cap_string]) && self::$transport[$cap_string] !== NULL) {
 			return new self::$transport[$cap_string]();
 		}
 		// @codeCoverageIgnoreEnd
@@ -210,7 +210,7 @@ 
 				break;
 			}
 		}
-		if (self::$transport[$cap_string] === null) {
+		if (self::$transport[$cap_string] === NULL) {
 			throw new Requests_Exception('No working transports found', 'notransport', self::$transports);
 		}
 
@@ -228,28 +228,28 @@ 
 	 * Send a GET request
 	 */
 	public static function get($url, $headers = array(), $options = array()) {
-		return self::request($url, $headers, null, self::GET, $options);
+		return self::request($url, $headers, NULL, self::GET, $options);
 	}
 
 	/**
 	 * Send a HEAD request
 	 */
 	public static function head($url, $headers = array(), $options = array()) {
-		return self::request($url, $headers, null, self::HEAD, $options);
+		return self::request($url, $headers, NULL, self::HEAD, $options);
 	}
 
 	/**
 	 * Send a DELETE request
 	 */
 	public static function delete($url, $headers = array(), $options = array()) {
-		return self::request($url, $headers, null, self::DELETE, $options);
+		return self::request($url, $headers, NULL, self::DELETE, $options);
 	}
 
 	/**
 	 * Send a TRACE request
 	 */
 	public static function trace($url, $headers = array(), $options = array()) {
-		return self::request($url, $headers, null, self::TRACE, $options);
+		return self::request($url, $headers, NULL, self::TRACE, $options);
 	}
 	/**#@-*/
 
@@ -425,7 +425,7 @@ 
 	 * @return array Responses (either Requests_Response or a Requests_Exception object)
 	 */
 	public static function request_multiple($requests, $options = array()) {
-		$options = array_merge(self::get_default_options(true), $options);
+		$options = array_merge(self::get_default_options(TRUE), $options);
 
 		if (!empty($options['hooks'])) {
 			$options['hooks']->register('transport.internal.parse_response', array('Requests', 'parse_multiple'));
@@ -499,7 +499,7 @@ 
 	 * @param boolean $multirequest Is this a multirequest?
 	 * @return array Default option values
 	 */
-	protected static function get_default_options($multirequest = false) {
+	protected static function get_default_options($multirequest = FALSE) {
 		$defaults = array(
 			'timeout' => 10,
 			'connect_timeout' => 10,
@@ -507,22 +507,22 @@ 
 			'protocol_version' => 1.1,
 			'redirected' => 0,
 			'redirects' => 10,
-			'follow_redirects' => true,
-			'blocking' => true,
+			'follow_redirects' => TRUE,
+			'blocking' => TRUE,
 			'type' => self::GET,
-			'filename' => false,
-			'auth' => false,
-			'proxy' => false,
-			'cookies' => false,
-			'max_bytes' => false,
-			'idn' => true,
-			'hooks' => null,
-			'transport' => null,
+			'filename' => FALSE,
+			'auth' => FALSE,
+			'proxy' => FALSE,
+			'cookies' => FALSE,
+			'max_bytes' => FALSE,
+			'idn' => TRUE,
+			'hooks' => NULL,
+			'transport' => NULL,
 			'verify' => Requests::get_certificate_path(),
-			'verifyname' => true,
+			'verifyname' => TRUE,
 		);
-		if ($multirequest !== false) {
-			$defaults['complete'] = null;
+		if ($multirequest !== FALSE) {
+			$defaults['complete'] = NULL;
 		}
 		return $defaults;
 	}
@@ -571,14 +571,14 @@ 
 		if (is_array($options['auth'])) {
 			$options['auth'] = new Requests_Auth_Basic($options['auth']);
 		}
-		if ($options['auth'] !== false) {
+		if ($options['auth'] !== FALSE) {
 			$options['auth']->register($options['hooks']);
 		}
 
 		if (is_string($options['proxy']) || is_array($options['proxy'])) {
 			$options['proxy'] = new Requests_Proxy_HTTP($options['proxy']);
 		}
-		if ($options['proxy'] !== false) {
+		if ($options['proxy'] !== FALSE) {
 			$options['proxy']->register($options['hooks']);
 		}
 
@@ -588,11 +588,11 @@ 
 		elseif (empty($options['cookies'])) {
 			$options['cookies'] = new Requests_Cookie_Jar();
 		}
-		if ($options['cookies'] !== false) {
+		if ($options['cookies'] !== FALSE) {
 			$options['cookies']->register($options['hooks']);
 		}
 
-		if ($options['idn'] !== false) {
+		if ($options['idn'] !== FALSE) {
 			$iri = new Requests_IRI($url);
 			$iri->host = Requests_IDNAEncoder::encode($iri->ihost);
 			$url = $iri->uri;
@@ -635,7 +635,7 @@ 
 		$return->url = $url;
 
 		if (!$options['filename']) {
-			if (($pos = strpos($headers, "\r\n\r\n")) === false) {
+			if (($pos = strpos($headers, "\r\n\r\n")) === FALSE) {
 				// Crap!
 				throw new Requests_Exception('Missing header/body separator', 'requests.no_crlf_separator');
 			}
@@ -658,7 +658,7 @@ 
 		$return->protocol_version = (float) $matches[1];
 		$return->status_code = (int) $matches[2];
 		if ($return->status_code >= 200 && $return->status_code < 300) {
-			$return->success = true;
+			$return->success = TRUE;
 		}
 
 		foreach ($headers as $header) {
@@ -682,7 +682,7 @@ 
 
 		$options['hooks']->dispatch('requests.before_redirect_check', array(&$return, $req_headers, $req_data, $options));
 
-		if ($return->is_redirect() && $options['follow_redirects'] === true) {
+		if ($return->is_redirect() && $options['follow_redirects'] === TRUE) {
 			if (isset($return->headers['location']) && $options['redirected'] < $options['redirects']) {
 				if ($return->status_code === 303) {
 					$options['type'] = self::GET;
@@ -758,7 +758,7 @@ 
 		$decoded = '';
 		$encoded = $data;
 
-		while (true) {
+		while (TRUE) {
 			$is_chunked = (bool) preg_match('/^([0-9a-f]+)(?:;(?:[\w-]*)(?:=(?:(?:[\w-]*)*|"(?:[^\r\n])*"))?)*\r\n/i', $encoded, $matches);
 			if (!$is_chunked) {
 				// Looks like it's not chunked after all
@@ -826,16 +826,16 @@ 
 			return $data;
 		}
 
-		if (function_exists('gzdecode') && ($decoded = @gzdecode($data)) !== false) {
+		if (function_exists('gzdecode') && ($decoded = @gzdecode($data)) !== FALSE) {
 			return $decoded;
 		}
-		elseif (function_exists('gzinflate') && ($decoded = @gzinflate($data)) !== false) {
+		elseif (function_exists('gzinflate') && ($decoded = @gzinflate($data)) !== FALSE) {
 			return $decoded;
 		}
-		elseif (($decoded = self::compatible_gzinflate($data)) !== false) {
+		elseif (($decoded = self::compatible_gzinflate($data)) !== FALSE) {
 			return $decoded;
 		}
-		elseif (function_exists('gzuncompress') && ($decoded = @gzuncompress($data)) !== false) {
+		elseif (function_exists('gzuncompress') && ($decoded = @gzuncompress($data)) !== FALSE) {
 			return $decoded;
 		}
 
@@ -884,7 +884,7 @@ 
 				}
 			}
 			$decompressed = self::compatible_gzinflate(substr($gzData, $i));
-			if (false !== $decompressed) {
+			if (FALSE !== $decompressed) {
 				return $decompressed;
 			}
 		}
@@ -897,7 +897,7 @@ 
 		//
 		// See https://decompres.blogspot.com/ for a quick explanation of this
 		// data type
-		$huffman_encoded = false;
+		$huffman_encoded = FALSE;
 
 		// low nibble of first byte should be 0x08
 		list(, $first_nibble)    = unpack('h', $gzData);
@@ -906,11 +906,11 @@ 
 		list(, $first_two_bytes) = unpack('n', $gzData);
 
 		if (0x08 == $first_nibble && 0 == ($first_two_bytes % 0x1F)) {
-			$huffman_encoded = true;
+			$huffman_encoded = TRUE;
 		}
 
 		if ($huffman_encoded) {
-			if (false !== ($decompressed = @gzinflate(substr($gzData, 2)))) {
+			if (FALSE !== ($decompressed = @gzinflate(substr($gzData, 2)))) {
 				return $decompressed;
 			}
 		}
@@ -937,44 +937,44 @@ 
 			// Determine the first byte of data, based on the above ZIP header
 			// offsets:
 			$first_file_start = array_sum(unpack('v2', substr($gzData, 26, 4)));
-			if (false !== ($decompressed = @gzinflate(substr($gzData, 30 + $first_file_start)))) {
+			if (FALSE !== ($decompressed = @gzinflate(substr($gzData, 30 + $first_file_start)))) {
 				return $decompressed;
 			}
-			return false;
+			return FALSE;
 		}
 
 		// Finally fall back to straight gzinflate
-		if (false !== ($decompressed = @gzinflate($gzData))) {
+		if (FALSE !== ($decompressed = @gzinflate($gzData))) {
 			return $decompressed;
 		}
 
 		// Fallback for all above failing, not expected, but included for
 		// debugging and preventing regressions and to track stats
-		if (false !== ($decompressed = @gzinflate(substr($gzData, 2)))) {
+		if (FALSE !== ($decompressed = @gzinflate(substr($gzData, 2)))) {
 			return $decompressed;
 		}
 
-		return false;
+		return FALSE;
 	}
 
 	public static function match_domain($host, $reference) {
 		// Check for a direct match
 		if ($host === $reference) {
-			return true;
+			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.
 		$parts = explode('.', $host);
-		if (ip2long($host) === false && count($parts) >= 3) {
+		if (ip2long($host) === FALSE && count($parts) >= 3) {
 			$parts[0] = '*';
 			$wildcard = implode('.', $parts);
 			if ($wildcard === $reference) {
-				return true;
+				return TRUE;
 			}
 		}
 
-		return false;
+		return FALSE;
 	}
 }

php/Requests/SendJodel.php

Braces +2 added lines, -1 removed lines

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

Indentation +18 added lines, -18 removed lines

@@ -1,26 +1,26 @@
 <?php
 
 class SendJodel extends AbstractRequest {
-    public $location;
-    public $ancestor = "";
-    public $color = "";
+	public $location;
+	public $ancestor = "";
+	public $color = "";
     
-    function getApiEndPoint()
-    {
-        return '/v3/posts/';
-    }
+	function getApiEndPoint()
+	{
+		return '/v3/posts/';
+	}
 
-    function getPayload()
-    {
-        return array(
+	function getPayload()
+	{
+		return array(
 			"ancestor" => $this->ancestor,
 			"color" => $this->color,
-            "location" => $this->location->toArray(),
-            "message" => $_POST['message'],
-        );
-    }
-    function getMethod()
-    {
-        return 'POST';
-    }
+			"location" => $this->location->toArray(),
+			"message" => $_POST['message'],
+		);
+	}
+	function getMethod()
+	{
+		return 'POST';
+	}
 }

php/Requests/UpdateLocation.php

Braces +2 added lines, -1 removed lines

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

Indentation +30 added lines, -30 removed lines

@@ -3,37 +3,37 @@
 
 class UpdateLocation extends AbstractRequest {
 		 /**
-     * @var Location
-     */
-    public $location;
-    /**
-     * @return Location
-     */
-    public function getLocation()
-    {
-        return $this->location;
-    }
-    /**
-     * @param Location $location
-     */
-    public function setLocation($location)
-    {
-        $this->location = $location;
-    }
+		  * @var Location
+		  */
+	public $location;
+	/**
+	 * @return Location
+	 */
+	public function getLocation()
+	{
+		return $this->location;
+	}
+	/**
+	 * @param Location $location
+	 */
+	public function setLocation($location)
+	{
+		$this->location = $location;
+	}
 		
-    function getApiEndPoint()
-    {
-        return '/v2/users/location';
-    }
-    function getPayload()
-    {
-        return array(
+	function getApiEndPoint()
+	{
+		return '/v2/users/location';
+	}
+	function getPayload()
+	{
+		return array(
 					"location" => $this->getLocation()->toArray(),
-        );
-    }
-    function getMethod()
-    {
-        return 'PUT';
-    }
+		);
+	}
+	function getMethod()
+	{
+		return 'PUT';
+	}
 }