ntwb / wordpress

src/wp-includes/Requests/IRI.php

Doc Comments +2 added lines, -1 removed lines

@@ -249,7 +249,7 @@ 
 	 *
 	 * Returns false if $base is not absolute, otherwise an IRI.
 	 *
-	 * @param IRI|string $base (Absolute) Base IRI
+	 * @param string $base (Absolute) Base IRI
 	 * @param IRI|string $relative Relative IRI
 	 * @return IRI|false
 	 */
@@ -987,6 +987,7 @@ 
 	 * Convert an IRI to a URI (or parts thereof)
 	 *
 	 * @param string|bool IRI to convert (or false from {@see get_iri})
+	 * @param false|string $string
 	 * @return string|false URI if IRI is valid, false otherwise.
 	 */
 	protected function to_uri($string) {

Braces +30 added lines, -60 removed lines

@@ -155,8 +155,7 @@ 
 	public function __set($name, $value) {
 		if (method_exists($this, 'set_' . $name)) {
 			call_user_func(array($this, 'set_' . $name), $value);
-		}
-		elseif (
+		} elseif (
 			   $name === 'iauthority'
 			|| $name === 'iuserinfo'
 			|| $name === 'ihost'
@@ -187,8 +186,7 @@ 
 		) {
 			$method = 'get_' . $name;
 			$return = $this->$method();
-		}
-		elseif (array_key_exists($name, $props)) {
+		} elseif (array_key_exists($name, $props)) {
 			$return = $this->$name;
 		}
 		// host -> ihost
@@ -200,16 +198,14 @@ 
 		elseif (($prop = substr($name, 1)) && array_key_exists($prop, $props)) {
 			$name = $prop;
 			$return = $this->$prop;
-		}
-		else {
+		} else {
 			trigger_error('Undefined property: ' . get_class($this) . '::' . $name, E_USER_NOTICE);
 			$return = null;
 		}
 
 		if ($return === null && isset($this->normalization[$this->scheme][$name])) {
 			return $this->normalization[$this->scheme][$name];
-		}
-		else {
+		} else {
 			return $return;
 		}
 	}
@@ -259,8 +255,7 @@ 
 		}
 		if (!$relative->is_valid()) {
 			return false;
-		}
-		elseif ($relative->scheme !== null) {
+		} elseif ($relative->scheme !== null) {
 			return clone $relative;
 		}
 
@@ -275,8 +270,7 @@ 
 			if ($relative->iuserinfo !== null || $relative->ihost !== null || $relative->port !== null) {
 				$target = clone $relative;
 				$target->scheme = $base->scheme;
-			}
-			else {
+			} else {
 				$target = new Requests_IRI;
 				$target->scheme = $base->scheme;
 				$target->iuserinfo = $base->iuserinfo;
@@ -285,32 +279,26 @@ 
 				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 {
+					} else {
 						$target->ipath = $relative->ipath;
 					}
 					$target->ipath = $target->remove_dot_segments($target->ipath);
 					$target->iquery = $relative->iquery;
-				}
-				else {
+				} else {
 					$target->ipath = $base->ipath;
 					if ($relative->iquery !== null) {
 						$target->iquery = $relative->iquery;
-					}
-					elseif ($base->iquery !== null) {
+					} elseif ($base->iquery !== null) {
 						$target->iquery = $base->iquery;
 					}
 				}
 				$target->ifragment = $relative->ifragment;
 			}
-		}
-		else {
+		} else {
 			$target = clone $base;
 			$target->ifragment = null;
 		}
@@ -362,8 +350,7 @@ 
 			// then remove that prefix from the input buffer; otherwise,
 			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 "/.",
@@ -371,8 +358,7 @@ 
 			// with "/" in the input buffer; otherwise,
 			elseif (strpos($input, '/./') === 0) {
 				$input = substr($input, 2);
-			}
-			elseif ($input === '/.') {
+			} elseif ($input === '/.') {
 				$input = '/';
 			}
 			// C: if the input buffer begins with a prefix of "/../" or "/..",
@@ -382,8 +368,7 @@ 
 			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, '/'));
 			}
@@ -399,8 +384,7 @@ 
 			elseif (($pos = strpos($input, '/', 1)) !== false) {
 				$output .= substr($input, 0, $pos);
 				$input = substr_replace($input, '', 0, $pos);
-			}
-			else {
+			} else {
 				$output .= $input;
 				$input = '';
 			}
@@ -482,8 +466,7 @@ 
 							break;
 						}
 					}
-				}
-				else {
+				} else {
 					$position = $strlen - 1;
 					$valid = false;
 				}
@@ -634,8 +617,7 @@ 
 					for ($j = $start; $j <= $i; $j++) {
 						$string .= '%' . strtoupper($bytes[$j]);
 					}
-				}
-				else {
+				} else {
 					for ($j = $start; $j <= $i; $j++) {
 						$string .= chr(hexdec($bytes[$j]));
 					}
@@ -763,12 +745,10 @@ 
 	protected function set_scheme($scheme) {
 		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;
-		}
-		else {
+		} else {
 			$this->scheme = strtolower($scheme);
 		}
 		return true;
@@ -806,8 +786,7 @@ 
 		if (($iuserinfo_end = strrpos($remaining, '@')) !== false) {
 			$iuserinfo = substr($remaining, 0, $iuserinfo_end);
 			$remaining = substr($remaining, $iuserinfo_end + 1);
-		}
-		else {
+		} else {
 			$iuserinfo = null;
 		}
 		if (($port_start = strpos($remaining, ':', strpos($remaining, ']'))) !== false) {
@@ -816,8 +795,7 @@ 
 				$port = null;
 			}
 			$remaining = substr($remaining, 0, $port_start);
-		}
-		else {
+		} else {
 			$port = null;
 		}
 
@@ -842,8 +820,7 @@ 
 	protected function set_userinfo($iuserinfo) {
 		if ($iuserinfo === null) {
 			$this->iuserinfo = null;
-		}
-		else {
+		} else {
 			$this->iuserinfo = $this->replace_invalid_with_pct_encoding($iuserinfo, '!$&\'()*+,;=:');
 			$this->scheme_normalization();
 		}
@@ -866,13 +843,11 @@ 
 		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 {
+			} else {
 				$this->ihost = null;
 				return false;
 			}
-		}
-		else {
+		} else {
 			$ihost = $this->replace_invalid_with_pct_encoding($ihost, '!$&\'()*+,;=');
 
 			// Lowercase, but ignore pct-encoded sections (as they should
@@ -883,8 +858,7 @@ 
 			while (($position += strcspn($ihost, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ%', $position)) < $strlen) {
 				if ($ihost[$position] === '%') {
 					$position += 3;
-				}
-				else {
+				} else {
 					$ihost[$position] = strtolower($ihost[$position]);
 					$position++;
 				}
@@ -937,8 +911,7 @@ 
 
 		if (isset($cache[$ipath])) {
 			$this->ipath = $cache[$ipath][(int) ($this->scheme !== null)];
-		}
-		else {
+		} else {
 			$valid = $this->replace_invalid_with_pct_encoding($ipath, '!$&\'()*+,;=@:/');
 			$removed = $this->remove_dot_segments($valid);
 
@@ -958,8 +931,7 @@ 
 	protected function set_query($iquery) {
 		if ($iquery === null) {
 			$this->iquery = null;
-		}
-		else {
+		} else {
 			$this->iquery = $this->replace_invalid_with_pct_encoding($iquery, '!$&\'()*+,;=:@/?', true);
 			$this->scheme_normalization();
 		}
@@ -975,8 +947,7 @@ 
 	protected function set_fragment($ifragment) {
 		if ($ifragment === null) {
 			$this->ifragment = null;
-		}
-		else {
+		} else {
 			$this->ifragment = $this->replace_invalid_with_pct_encoding($ifragment, '!$&\'()*+,;=:@/?');
 			$this->scheme_normalization();
 		}
@@ -1079,8 +1050,7 @@ 
 		$iauthority = $this->get_iauthority();
 		if (is_string($iauthority)) {
 			return $this->to_uri($iauthority);
-		}
-		else {
+		} else {
 			return $iauthority;
 		}
 	}

Spacing +43 added lines, -43 removed lines

@@ -153,8 +153,8 @@ 
 	 * @param mixed $value Property value
 	 */
 	public function __set($name, $value) {
-		if (method_exists($this, 'set_' . $name)) {
-			call_user_func(array($this, 'set_' . $name), $value);
+		if (method_exists($this, 'set_'.$name)) {
+			call_user_func(array($this, 'set_'.$name), $value);
 		}
 		elseif (
 			   $name === 'iauthority'
@@ -164,7 +164,7 @@ 
 			|| $name === 'iquery'
 			|| $name === 'ifragment'
 		) {
-			call_user_func(array($this, 'set_' . substr($name, 1)), $value);
+			call_user_func(array($this, 'set_'.substr($name, 1)), $value);
 		}
 	}
 
@@ -185,14 +185,14 @@ 
 			$name === 'iauthority' ||
 			$name === 'authority'
 		) {
-			$method = 'get_' . $name;
+			$method = 'get_'.$name;
 			$return = $this->$method();
 		}
 		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;
 		}
@@ -202,7 +202,7 @@ 
 			$return = $this->$prop;
 		}
 		else {
-			trigger_error('Undefined property: ' . get_class($this) . '::' . $name, E_USER_NOTICE);
+			trigger_error('Undefined property: '.get_class($this).'::'.$name, E_USER_NOTICE);
 			$return = null;
 		}
 
@@ -221,7 +221,7 @@ 
 	 * @return bool
 	 */
 	public function __isset($name) {
-		return (method_exists($this, 'get_' . $name) || isset($this->$name));
+		return (method_exists($this, 'get_'.$name) || isset($this->$name));
 	}
 
 	/**
@@ -230,8 +230,8 @@ 
 	 * @param string $name Property name
 	 */
 	public function __unset($name) {
-		if (method_exists($this, 'set_' . $name)) {
-			call_user_func(array($this, 'set_' . $name), '');
+		if (method_exists($this, 'set_'.$name)) {
+			call_user_func(array($this, 'set_'.$name), '');
 		}
 	}
 
@@ -254,20 +254,20 @@ 
 	 * @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) {
 			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;
 		}
 
@@ -287,10 +287,10 @@ 
 						$target->ipath = $relative->ipath;
 					}
 					elseif (($base->iuserinfo !== null || $base->ihost !== null || $base->port !== null) && $base->ipath === '') {
-						$target->ipath = '/' . $relative->ipath;
+						$target->ipath = '/'.$relative->ipath;
 					}
 					elseif (($last_segment = strrpos($base->ipath, '/')) !== false) {
-						$target->ipath = substr($base->ipath, 0, $last_segment + 1) . $relative->ipath;
+						$target->ipath = substr($base->ipath, 0, $last_segment + 1).$relative->ipath;
 					}
 					else {
 						$target->ipath = $relative->ipath;
@@ -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] === '') {
 			$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;
@@ -405,7 +405,7 @@ 
 				$input = '';
 			}
 		}
-		return $output . $input;
+		return $output.$input;
 	}
 
 	/**
@@ -492,7 +492,7 @@ 
 			// Percent encode anything invalid or not in ucschar
 			if (
 				// Invalid sequences
-				!$valid
+				! $valid
 				// Non-shortest form sequences are invalid
 				|| $length > 1 && $character <= 0x7F
 				|| $length > 2 && $character <= 0x7FF
@@ -509,7 +509,7 @@ 
 				)
 				&& (
 					// Everything not in iprivate, if it applies
-					   !$iprivate
+					   ! $iprivate
 					|| $character < 0xE000
 					|| $character > 0x10FFFD
 				)
@@ -556,7 +556,7 @@ 
 			$value = hexdec($bytes[$i]);
 
 			// If we're the first byte of sequence:
-			if (!$remaining) {
+			if ( ! $remaining) {
 				// Start position
 				$start = $i;
 
@@ -608,11 +608,11 @@ 
 			}
 
 			// 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 (
 					// Invalid sequences
-					!$valid
+					! $valid
 					// Non-shortest form sequences are invalid
 					|| $length > 1 && $character <= 0x7F
 					|| $length > 2 && $character <= 0x7FF
@@ -632,7 +632,7 @@ 
 					|| $character > 0xD7FF && $character < 0xF900
 				) {
 					for ($j = $start; $j <= $i; $j++) {
-						$string .= '%' . strtoupper($bytes[$j]);
+						$string .= '%'.strtoupper($bytes[$j]);
 					}
 				}
 				else {
@@ -647,7 +647,7 @@ 
 		// mid-way through a multi-byte sequence)
 		if ($remaining) {
 			for ($j = $start; $j < $len; $j++) {
-				$string .= '%' . strtoupper($bytes[$j]);
+				$string .= '%'.strtoupper($bytes[$j]);
 			}
 		}
 
@@ -691,7 +691,7 @@ 
 				$isauthority && $this->ipath[0] !== '/' ||
 				(
 					$this->scheme === null &&
-					!$isauthority &&
+					! $isauthority &&
 					strpos($this->ipath, ':') !== false &&
 					(strpos($this->ipath, '/') === false ? true : strpos($this->ipath, ':') < strpos($this->ipath, '/'))
 				)
@@ -712,7 +712,7 @@ 
 	 */
 	protected function set_iri($iri) {
 		static $cache;
-		if (!$cache) {
+		if ( ! $cache) {
 			$cache = array();
 		}
 
@@ -761,7 +761,7 @@ 
 		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,7 +780,7 @@ 
 	 */
 	protected function set_authority($authority) {
 		static $cache;
-		if (!$cache) {
+		if ( ! $cache) {
 			$cache = array();
 		}
 
@@ -862,7 +862,7 @@ 
 		}
 		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)) . ']';
+				$this->ihost = '['.Requests_IPv6::compress(substr($ihost, 1, -1)).']';
 			}
 			else {
 				$this->ihost = null;
@@ -926,7 +926,7 @@ 
 	 */
 	protected function set_path($ipath) {
 		static $cache;
-		if (!$cache) {
+		if ( ! $cache) {
 			$cache = array();
 		}
 
@@ -987,12 +987,12 @@ 
 	 * @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"));
 		}
 
@@ -1013,23 +1013,23 @@ 
 	 * @return string
 	 */
 	protected function get_iri() {
-		if (!$this->is_valid()) {
+		if ( ! $this->is_valid()) {
 			return false;
 		}
 
 		$iri = '';
 		if ($this->scheme !== null) {
-			$iri .= $this->scheme . ':';
+			$iri .= $this->scheme.':';
 		}
 		if (($iauthority = $this->get_iauthority()) !== null) {
-			$iri .= '//' . $iauthority;
+			$iri .= '//'.$iauthority;
 		}
 		$iri .= $this->ipath;
 		if ($this->iquery !== null) {
-			$iri .= '?' . $this->iquery;
+			$iri .= '?'.$this->iquery;
 		}
 		if ($this->ifragment !== null) {
-			$iri .= '#' . $this->ifragment;
+			$iri .= '#'.$this->ifragment;
 		}
 
 		return $iri;
@@ -1056,13 +1056,13 @@ 
 
 		$iauthority = '';
 		if ($this->iuserinfo !== null) {
-			$iauthority .= $this->iuserinfo . '@';
+			$iauthority .= $this->iuserinfo.'@';
 		}
 		if ($this->ihost !== null) {
 			$iauthority .= $this->ihost;
 		}
 		if ($this->port !== null) {
-			$iauthority .= ':' . $this->port;
+			$iauthority .= ':'.$this->port;
 		}
 		return $iauthority;
 	}

src/wp-includes/Requests/Session.php

Doc Comments +1 added lines, -1 removed lines

@@ -232,7 +232,7 @@
 	 *
 	 * @param array $request Request data (same form as {@see request_multiple})
 	 * @param boolean $merge_options Should we merge options as well?
-	 * @return array Request data
+	 * @return string Request data
 	 */
 	protected function merge_request($request, $merge_options = true) {
 		if ($this->url !== null) {

Braces +1 added lines, -2 removed lines

@@ -249,8 +249,7 @@
 			if (is_array($this->data)) {
 				$request['data'] = $this->data;
 			}
-		}
-		elseif (is_array($request['data']) && is_array($this->data)) {
+		} elseif (is_array($request['data']) && is_array($this->data)) {
 			$request['data'] = array_merge($this->data, $request['data']);
 		}
 

src/wp-includes/Requests/Proxy.php

Spacing +1 added lines, -1 removed lines

@@ -31,5 +31,5 @@
 	 * @see Requests_Hooks::register
 	 * @param Requests_Hooks $hooks Hook system
 	 */
-	public function register(Requests_Hooks &$hooks);
+	public function register(Requests_Hooks & $hooks);
 }
\ No newline at end of file

src/wp-includes/Requests/Cookie.php

Spacing +14 added lines, -14 removed lines

@@ -117,11 +117,11 @@ 
 	 * @return boolean Whether the cookie is valid for the given URI
 	 */
 	public function uri_matches(Requests_IRI $uri) {
-		if (!$this->domain_matches($uri->host)) {
+		if ( ! $this->domain_matches($uri->host)) {
 			return false;
 		}
 
-		if (!$this->path_matches($uri->path)) {
+		if ( ! $this->path_matches($uri->path)) {
 			return false;
 		}
 
@@ -135,7 +135,7 @@ 
 	 * @return boolean Whether the cookie is valid for the given domain
 	 */
 	public function domain_matches($string) {
-		if (!isset($this->attributes['domain'])) {
+		if ( ! isset($this->attributes['domain'])) {
 			// Cookies created manually; cookies created by Requests will set
 			// the domain to the requested domain
 			return true;
@@ -172,7 +172,7 @@ 
 		}
 
 		// The string should be a host name (i.e., not an IP address).
-		return !preg_match('#^(.+\.)\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$#', $string);
+		return ! preg_match('#^(.+\.)\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$#', $string);
 	}
 
 	/**
@@ -189,7 +189,7 @@ 
 			$request_path = '/';
 		}
 
-		if (!isset($this->attributes['path'])) {
+		if ( ! isset($this->attributes['path'])) {
 			// Cookies created manually; cookies created by Requests will set
 			// the path to the requested path
 			return true;
@@ -273,7 +273,7 @@ 
 				}
 
 				// Check that we have a valid age
-				if (!preg_match('/^-?\d+$/', $value)) {
+				if ( ! preg_match('/^-?\d+$/', $value)) {
 					return null;
 				}
 
@@ -332,7 +332,7 @@ 
 	 */
 	public function format_for_set_cookie() {
 		$header_value = $this->format_for_header();
-		if (!empty($this->attributes)) {
+		if ( ! empty($this->attributes)) {
 			$parts = array();
 			foreach ($this->attributes as $key => $value) {
 				// Ignore non-associative attributes
@@ -344,7 +344,7 @@ 
 				}
 			}
 
-			$header_value .= '; ' . implode('; ', $parts);
+			$header_value .= '; '.implode('; ', $parts);
 		}
 		return $header_value;
 	}
@@ -383,7 +383,7 @@ 
 		$parts = explode(';', $string);
 		$kvparts = array_shift($parts);
 
-		if (!empty($name)) {
+		if ( ! empty($name)) {
 			$value = $string;
 		}
 		elseif (strpos($kvparts, '=') === false) {
@@ -404,7 +404,7 @@ 
 		// Attribute key are handled case-insensitively
 		$attributes = new Requests_Utility_CaseInsensitiveDictionary();
 
-		if (!empty($parts)) {
+		if ( ! empty($parts)) {
 			foreach ($parts as $part) {
 				if (strpos($part, '=') === false) {
 					$part_key = $part;
@@ -442,7 +442,7 @@ 
 			$parsed = self::parse($header, '', $time);
 
 			// Default domain/path attributes
-			if (empty($parsed->attributes['domain']) && !empty($origin)) {
+			if (empty($parsed->attributes['domain']) && ! empty($origin)) {
 				$parsed->attributes['domain'] = $origin->host;
 				$parsed->flags['host-only'] = true;
 			}
@@ -450,8 +450,8 @@ 
 				$parsed->flags['host-only'] = false;
 			}
 
-			$path_is_valid = (!empty($parsed->attributes['path']) && $parsed->attributes['path'][0] === '/');
-			if (!$path_is_valid && !empty($origin)) {
+			$path_is_valid = ( ! empty($parsed->attributes['path']) && $parsed->attributes['path'][0] === '/');
+			if ( ! $path_is_valid && ! empty($origin)) {
 				$path = $origin->path;
 
 				// Default path normalization as per RFC 6265 section 5.1.4
@@ -477,7 +477,7 @@ 
 			}
 
 			// Reject invalid cookie domains
-			if (!empty($origin) && !$parsed->domain_matches($origin->host)) {
+			if ( ! empty($origin) && ! $parsed->domain_matches($origin->host)) {
 				continue;
 			}
 

Braces +8 added lines, -16 removed lines

@@ -280,8 +280,7 @@ 
 				$delta_seconds = (int) $value;
 				if ($delta_seconds <= 0) {
 					$expiry_time = 0;
-				}
-				else {
+				} else {
 					$expiry_time = $this->reference_time + $delta_seconds;
 				}
 
@@ -338,8 +337,7 @@ 
 				// Ignore non-associative attributes
 				if (is_numeric($key)) {
 					$parts[] = $value;
-				}
-				else {
+				} else {
 					$parts[] = sprintf('%s=%s', $key, $value);
 				}
 			}
@@ -385,8 +383,7 @@ 
 
 		if (!empty($name)) {
 			$value = $string;
-		}
-		elseif (strpos($kvparts, '=') === false) {
+		} elseif (strpos($kvparts, '=') === false) {
 			// Some sites might only have a value without the equals separator.
 			// Deviate from RFC 6265 and pretend it was actually a blank name
 			// (`=foo`)
@@ -394,8 +391,7 @@ 
 			// https://bugzilla.mozilla.org/show_bug.cgi?id=169091
 			$name = '';
 			$value = $kvparts;
-		}
-		else {
+		} else {
 			list($name, $value) = explode('=', $kvparts, 2);
 		}
 		$name = trim($name);
@@ -409,8 +405,7 @@ 
 				if (strpos($part, '=') === false) {
 					$part_key = $part;
 					$part_value = true;
-				}
-				else {
+				} else {
 					list($part_key, $part_value) = explode('=', $part, 2);
 					$part_value = trim($part_value);
 				}
@@ -445,8 +440,7 @@ 
 			if (empty($parsed->attributes['domain']) && !empty($origin)) {
 				$parsed->attributes['domain'] = $origin->host;
 				$parsed->flags['host-only'] = true;
-			}
-			else {
+			} else {
 				$parsed->flags['host-only'] = false;
 			}
 
@@ -460,14 +454,12 @@ 
 					// the uri-path is not a %x2F ("/") character, output
 					// %x2F ("/") and skip the remaining steps.
 					$path = '/';
-				}
-				elseif (substr_count($path, '/') === 1) {
+				} elseif (substr_count($path, '/') === 1) {
 					// If the uri-path contains no more than one %x2F ("/")
 					// character, output %x2F ("/") and skip the remaining
 					// step.
 					$path = '/';
-				}
-				else {
+				} else {
 					// Output the characters of the uri-path from the first
 					// character up to, but not including, the right-most
 					// %x2F ("/").

src/wp-includes/Requests/SSL.php

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
 		$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) {
 				$altname = trim($altname);
@@ -62,7 +62,7 @@ 
 
 		// 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) {
 				return true;

src/wp-includes/Requests/Proxy/HTTP.php

Spacing +2 added lines, -2 removed lines

@@ -82,7 +82,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.remote_socket', array(&$this, 'fsockopen_remote_socket'));
@@ -146,6 +146,6 @@ 
 	 * @return string
 	 */
 	public function get_auth_string() {
-		return $this->user . ':' . $this->pass;
+		return $this->user.':'.$this->pass;
 	}
 }
\ No newline at end of file

Braces +3 added lines, -6 removed lines

@@ -57,16 +57,13 @@
 	public function __construct($args = null) {
 		if (is_string($args)) {
 			$this->proxy = $args;
-		}
-		elseif (is_array($args)) {
+		} elseif (is_array($args)) {
 			if (count($args) == 1) {
 				list($this->proxy) = $args;
-			}
-			elseif (count($args) == 3) {
+			} elseif (count($args) == 3) {
 				list($this->proxy, $this->user, $this->pass) = $args;
 				$this->use_authentication = true;
-			}
-			else {
+			} else {
 				throw new Requests_Exception('Invalid number of arguments', 'proxyhttpbadargs');
 			}
 		}

src/wp-includes/Requests/Auth/Basic.php

Spacing +2 added lines, -2 removed lines

@@ -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'));
 	}
@@ -83,6 +83,6 @@ 
 	 * @return string
 	 */
 	public function getAuthString() {
-		return $this->user . ':' . $this->pass;
+		return $this->user.':'.$this->pass;
 	}
 }
\ No newline at end of file

src/wp-includes/Requests/Exception/HTTP.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
 	 * @return string Exception class name to use
 	 */
 	public static function get_class($code) {
-		if (!$code) {
+		if ( ! $code) {
 			return 'Requests_Exception_HTTP_Unknown';
 		}
 

src/wp-includes/Requests/Response.php

Spacing +2 added lines, -2 removed lines

@@ -109,11 +109,11 @@
 	 */
 	public function throw_for_status($allow_redirects = true) {
 		if ($this->is_redirect()) {
-			if (!$allow_redirects) {
+			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 +1 added lines, -2 removed lines

@@ -112,8 +112,7 @@
 			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);
 		}