ntwb / wordpress

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

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

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

src/wp-includes/Requests/Response/Headers.php

Spacing +3 added lines, -3 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;
 		}
 
@@ -47,7 +47,7 @@ 
 
 		$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;
 		}
 

src/wp-includes/Requests/Cookie/Jar.php

Spacing +5 added lines, -5 removed lines

@@ -71,7 +71,7 @@ 
 	 * @return string Item value
 	 */
 	public function offsetGet($key) {
-		if (!isset($this->cookies[$key])) {
+		if ( ! isset($this->cookies[$key])) {
 			return null;
 		}
 
@@ -134,11 +134,11 @@ 
 	 * @param array $options
 	 */
 	public function before_request($url, &$headers, &$data, &$type, &$options) {
-		if (!$url instanceof Requests_IRI) {
+		if ( ! $url instanceof Requests_IRI) {
 			$url = new Requests_IRI($url);
 		}
 
-		if (!empty($this->cookies)) {
+		if ( ! empty($this->cookies)) {
 			$cookies = array();
 			foreach ($this->cookies as $key => $cookie) {
 				$cookie = $this->normalize_cookie($cookie, $key);
@@ -162,9 +162,9 @@ 
 	 *
 	 * @var Requests_Response $response
 	 */
-	public function before_redirect_check(Requests_Response &$return) {
+	public function before_redirect_check(Requests_Response & $return) {
 		$url = $return->url;
-		if (!$url instanceof Requests_IRI) {
+		if ( ! $url instanceof Requests_IRI) {
 			$url = new Requests_IRI($url);
 		}
 

src/wp-includes/Requests/Transport/fsockopen.php

Braces +10 added lines, -20 removed lines

@@ -90,8 +90,7 @@ 
 			if (isset($options['verify'])) {
 				if ($options['verify'] === false) {
 					$context_options['verify_peer'] = false;
-				}
-				elseif (is_string($options['verify'])) {
+				} elseif (is_string($options['verify'])) {
 					$context_options['cafile'] = $options['verify'];
 				}
 			}
@@ -101,8 +100,7 @@ 
 			}
 
 			stream_context_set_option($context, array('ssl' => $context_options));
-		}
-		else {
+		} else {
 			$remote_socket = 'tcp://' . $host;
 		}
 
@@ -139,8 +137,7 @@ 
 		if ($data_format === 'query') {
 			$path = self::format_get($url_parts, $data);
 			$data = '';
-		}
-		else {
+		} else {
 			$path = self::format_get($url_parts, array());
 		}
 
@@ -152,8 +149,7 @@ 
 		if ($options['type'] !== Requests::TRACE) {
 			if (is_array($data)) {
 				$request_body = http_build_query($data, null, '&');
-			}
-			else {
+			} else {
 				$request_body = $data;
 			}
 
@@ -219,8 +215,7 @@ 
 		$timeout_sec = (int) floor($options['timeout']);
 		if ($timeout_sec == $options['timeout']) {
 			$timeout_msec = 0;
-		}
-		else {
+		} else {
 			$timeout_msec = self::SECOND_IN_MICROSECONDS * $options['timeout'] % self::SECOND_IN_MICROSECONDS;
 		}
 		stream_set_timeout($socket, $timeout_sec, $timeout_msec);
@@ -268,8 +263,7 @@ 
 				$size += strlen($block);
 				if ($download) {
 					fwrite($download, $block);
-				}
-				else {
+				} else {
 					$body .= $block;
 				}
 			}
@@ -278,8 +272,7 @@ 
 
 		if ($download) {
 			fclose($download);
-		}
-		else {
+		} else {
 			$this->headers .= "\r\n\r\n" . $body;
 		}
 		fclose($socket);
@@ -304,8 +297,7 @@ 
 				$responses[$id] = $handler->request($request['url'], $request['headers'], $request['data'], $request['options']);
 
 				$request['options']['hooks']->dispatch('transport.internal.parse_response', array(&$responses[$id], $request));
-			}
-			catch (Requests_Exception $e) {
+			} catch (Requests_Exception $e) {
 				$responses[$id] = $e;
 			}
 
@@ -356,12 +348,10 @@ 
 		if (isset($url_parts['path'])) {
 			if (isset($url_parts['query'])) {
 				$get = $url_parts['path'] . '?' . $url_parts['query'];
-			}
-			else {
+			} else {
 				$get = $url_parts['path'];
 			}
-		}
-		else {
+		} else {
 			$get = '/';
 		}
 		return $get;

Spacing +30 added lines, -30 removed lines

@@ -69,8 +69,8 @@ 
 
 		// HTTPS support
 		if (isset($url_parts['scheme']) && strtolower($url_parts['scheme']) === 'https') {
-			$remote_socket = 'ssl://' . $host;
-			if (!isset($url_parts['port'])) {
+			$remote_socket = 'ssl://'.$host;
+			if ( ! isset($url_parts['port'])) {
 				$url_parts['port'] = 443;
 			}
 
@@ -106,15 +106,15 @@ 
 			stream_context_set_option($context, array('ssl' => $context_options));
 		}
 		else {
-			$remote_socket = 'tcp://' . $host;
+			$remote_socket = 'tcp://'.$host;
 		}
 
 		$this->max_bytes = $options['max_bytes'];
 
-		if (!isset($url_parts['port'])) {
+		if ( ! isset($url_parts['port'])) {
 			$url_parts['port'] = 80;
 		}
-		$remote_socket .= ':' . $url_parts['port'];
+		$remote_socket .= ':'.$url_parts['port'];
 
 		set_error_handler(array($this, 'connect_error_handler'), E_WARNING | E_NOTICE);
 
@@ -124,11 +124,11 @@ 
 
 		restore_error_handler();
 
-		if ($verifyname && !$this->verify_certificate_from_context($host, $context)) {
+		if ($verifyname && ! $this->verify_certificate_from_context($host, $context)) {
 			throw new Requests_Exception('SSL certificate did not match the requested domain name', 'ssl.no_match');
 		}
 
-		if (!$socket) {
+		if ( ! $socket) {
 			if ($errno === 0) {
 				// Connection issue
 				throw new Requests_Exception(rtrim($this->connect_error), 'fsockopen.connect_error');
@@ -160,39 +160,39 @@ 
 				$request_body = $data;
 			}
 
-			if (!empty($data)) {
-				if (!isset($case_insensitive_headers['Content-Length'])) {
+			if ( ! empty($data)) {
+				if ( ! isset($case_insensitive_headers['Content-Length'])) {
 					$headers['Content-Length'] = strlen($request_body);
 				}
 
-				if (!isset($case_insensitive_headers['Content-Type'])) {
+				if ( ! isset($case_insensitive_headers['Content-Type'])) {
 					$headers['Content-Type'] = 'application/x-www-form-urlencoded; charset=UTF-8';
 				}
 			}
 		}
 
-		if (!isset($case_insensitive_headers['Host'])) {
+		if ( ! isset($case_insensitive_headers['Host'])) {
 			$out .= sprintf('Host: %s', $url_parts['host']);
 
-			if (( 'http' === strtolower($url_parts['scheme']) && $url_parts['port'] !== 80 ) || ( 'https' === strtolower($url_parts['scheme']) && $url_parts['port'] !== 443 )) {
-				$out .= ':' . $url_parts['port'];
+			if (('http' === strtolower($url_parts['scheme']) && $url_parts['port'] !== 80) || ('https' === strtolower($url_parts['scheme']) && $url_parts['port'] !== 443)) {
+				$out .= ':'.$url_parts['port'];
 			}
 			$out .= "\r\n";
 		}
 
-		if (!isset($case_insensitive_headers['User-Agent'])) {
+		if ( ! isset($case_insensitive_headers['User-Agent'])) {
 			$out .= sprintf("User-Agent: %s\r\n", $options['useragent']);
 		}
 
 		$accept_encoding = $this->accept_encoding();
-		if (!isset($case_insensitive_headers['Accept-Encoding']) && !empty($accept_encoding)) {
+		if ( ! isset($case_insensitive_headers['Accept-Encoding']) && ! empty($accept_encoding)) {
 			$out .= sprintf("Accept-Encoding: %s\r\n", $accept_encoding);
 		}
 
 		$headers = Requests::flatten($headers);
 
-		if (!empty($headers)) {
-			$out .= implode($headers, "\r\n") . "\r\n";
+		if ( ! empty($headers)) {
+			$out .= implode($headers, "\r\n")."\r\n";
 		}
 
 		$options['hooks']->dispatch('fsockopen.after_headers', array(&$out));
@@ -201,18 +201,18 @@ 
 			$out .= "\r\n";
 		}
 
-		if (!isset($case_insensitive_headers['Connection'])) {
+		if ( ! isset($case_insensitive_headers['Connection'])) {
 			$out .= "Connection: Close\r\n";
 		}
 
-		$out .= "\r\n" . $request_body;
+		$out .= "\r\n".$request_body;
 
 		$options['hooks']->dispatch('fsockopen.before_send', array(&$out));
 
 		fwrite($socket, $out);
 		$options['hooks']->dispatch('fsockopen.after_send', array($out));
 
-		if (!$options['blocking']) {
+		if ( ! $options['blocking']) {
 			fclose($socket);
 			$fake_headers = '';
 			$options['hooks']->dispatch('fsockopen.after_request', array(&$fake_headers));
@@ -237,14 +237,14 @@ 
 			$download = fopen($options['filename'], 'wb');
 		}
 
-		while (!feof($socket)) {
+		while ( ! feof($socket)) {
 			$this->info = stream_get_meta_data($socket);
 			if ($this->info['timed_out']) {
 				throw new Requests_Exception('fsocket timed out', 'timeout');
 			}
 
 			$block = fread($socket, Requests::BUFFER_SIZE);
-			if (!$doingbody) {
+			if ( ! $doingbody) {
 				$response .= $block;
 				if (strpos($response, "\r\n\r\n")) {
 					list($headers, $block) = explode("\r\n\r\n", $response, 2);
@@ -283,7 +283,7 @@ 
 			fclose($download);
 		}
 		else {
-			$this->headers .= "\r\n\r\n" . $body;
+			$this->headers .= "\r\n\r\n".$body;
 		}
 		fclose($socket);
 
@@ -312,7 +312,7 @@ 
 				$responses[$id] = $e;
 			}
 
-			if (!is_string($responses[$id])) {
+			if ( ! is_string($responses[$id])) {
 				$request['options']['hooks']->dispatch('multiple.request.complete', array(&$responses[$id], $id));
 			}
 		}
@@ -348,17 +348,17 @@ 
 	 * @return string URL with data
 	 */
 	protected static function format_get($url_parts, $data) {
-		if (!empty($data)) {
+		if ( ! empty($data)) {
 			if (empty($url_parts['query'])) {
 				$url_parts['query'] = '';
 			}
 
-			$url_parts['query'] .= '&' . http_build_query($data, null, '&');
+			$url_parts['query'] .= '&'.http_build_query($data, null, '&');
 			$url_parts['query'] = trim($url_parts['query'], '&');
 		}
 		if (isset($url_parts['path'])) {
 			if (isset($url_parts['query'])) {
-				$get = $url_parts['path'] . '?' . $url_parts['query'];
+				$get = $url_parts['path'].'?'.$url_parts['query'];
 			}
 			else {
 				$get = $url_parts['path'];
@@ -383,7 +383,7 @@ 
 			return false;
 		}
 
-		$this->connect_error .= $errstr . "\n";
+		$this->connect_error .= $errstr."\n";
 		return true;
 	}
 
@@ -423,13 +423,13 @@ 
 	 * @return boolean True if the transport is valid, false otherwise.
 	 */
 	public static function test($capabilities = array()) {
-		if (!function_exists('fsockopen')) {
+		if ( ! function_exists('fsockopen')) {
 			return false;
 		}
 
 		// If needed, check that streams support SSL
 		if (isset($capabilities['ssl']) && $capabilities['ssl']) {
-			if (!extension_loaded('openssl') || !function_exists('openssl_x509_parse')) {
+			if ( ! extension_loaded('openssl') || ! function_exists('openssl_x509_parse')) {
 				return false;
 			}
 

src/wp-includes/Requests/Transport/cURL.php

Braces +10 added lines, -20 removed lines

@@ -149,8 +149,7 @@ 
 			if ($options['verify'] === false) {
 				curl_setopt($this->handle, CURLOPT_SSL_VERIFYHOST, 0);
 				curl_setopt($this->handle, CURLOPT_SSL_VERIFYPEER, 0);
-			}
-			elseif (is_string($options['verify'])) {
+			} elseif (is_string($options['verify'])) {
 				curl_setopt($this->handle, CURLOPT_CAINFO, $options['verify']);
 			}
 		}
@@ -246,8 +245,7 @@ 
 								);
 					$responses[$key] = $exception;
 					$options['hooks']->dispatch('transport.internal.parse_error', array(&$responses[$key], $requests[$key]));
-				}
-				else {
+				} else {
 					$responses[$key] = $subrequests[$key]->process_response($subrequests[$key]->response_data, $options);
 
 					$options['hooks']->dispatch('transport.internal.parse_response', array(&$responses[$key], $requests[$key]));
@@ -322,8 +320,7 @@ 
 			if ($data_format === 'query') {
 				$url = self::format_get($url, $data);
 				$data = '';
-			}
-			elseif (!is_string($data)) {
+			} elseif (!is_string($data)) {
 				$data = http_build_query($data, null, '&');
 			}
 		}
@@ -359,15 +356,13 @@ 
 
 		if (is_int($timeout) || $this->version < self::CURL_7_16_2) {
 			curl_setopt($this->handle, CURLOPT_TIMEOUT, ceil($timeout));
-		}
-		else {
+		} else {
 			curl_setopt($this->handle, CURLOPT_TIMEOUT_MS, round($timeout * 1000));
 		}
 
 		if (is_int($options['connect_timeout']) || $this->version < self::CURL_7_16_2) {
 			curl_setopt($this->handle, CURLOPT_CONNECTTIMEOUT, ceil($options['connect_timeout']));
-		}
-		else {
+		} else {
 			curl_setopt($this->handle, CURLOPT_CONNECTTIMEOUT_MS, round($options['connect_timeout'] * 1000));
 		}
 		curl_setopt($this->handle, CURLOPT_URL, $url);
@@ -377,8 +372,7 @@ 
 
 		if ($options['protocol_version'] === 1.1) {
 			curl_setopt($this->handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
-		}
-		else {
+		} else {
 			curl_setopt($this->handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
 		}
 
@@ -405,8 +399,7 @@ 
 		if ($options['filename'] !== false) {
 			fclose($this->stream_handle);
 			$this->headers = trim($this->headers);
-		}
-		else {
+		} else {
 			$this->headers .= $response;
 		}
 
@@ -476,8 +469,7 @@ 
 
 		if ($this->stream_handle) {
 			fwrite($this->stream_handle, $data);
-		}
-		else {
+		} else {
 			$this->response_data .= $data;
 		}
 
@@ -497,8 +489,7 @@ 
 			$url_parts = parse_url($url);
 			if (empty($url_parts['query'])) {
 				$query = $url_parts['query'] = '';
-			}
-			else {
+			} else {
 				$query = $url_parts['query'];
 			}
 
@@ -507,8 +498,7 @@ 
 
 			if (empty($url_parts['query'])) {
 				$url .= '?' . $query;
-			}
-			else {
+			} else {
 				$url = str_replace($url_parts['query'], $query, $url);
 			}
 		}

Spacing +12 added lines, -12 removed lines

@@ -227,7 +227,7 @@ 
 			// Read the information as needed
 			while ($done = curl_multi_info_read($multihandle)) {
 				$key = array_search($done['handle'], $subhandles, true);
-				if (!isset($to_process[$key])) {
+				if ( ! isset($to_process[$key])) {
 					$to_process[$key] = $done;
 				}
 			}
@@ -256,7 +256,7 @@ 
 				curl_multi_remove_handle($multihandle, $done['handle']);
 				curl_close($done['handle']);
 
-				if (!is_string($responses[$key])) {
+				if ( ! is_string($responses[$key])) {
 					$options['hooks']->dispatch('multiple.request.complete', array(&$responses[$key], $key));
 				}
 				$completed++;
@@ -310,20 +310,20 @@ 
 		$options['hooks']->dispatch('curl.before_request', array(&$this->handle));
 
 		// Force closing the connection for old versions of cURL (<7.22).
-		if ( ! isset( $headers['Connection'] ) ) {
+		if ( ! isset($headers['Connection'])) {
 			$headers['Connection'] = 'close';
 		}
 
 		$headers = Requests::flatten($headers);
 
-		if (!empty($data)) {
+		if ( ! empty($data)) {
 			$data_format = $options['data_format'];
 
 			if ($data_format === 'query') {
 				$url = self::format_get($url, $data);
 				$data = '';
 			}
-			elseif (!is_string($data)) {
+			elseif ( ! is_string($data)) {
 				$data = http_build_query($data, null, '&');
 			}
 		}
@@ -346,7 +346,7 @@ 
 			case Requests::OPTIONS:
 			default:
 				curl_setopt($this->handle, CURLOPT_CUSTOMREQUEST, $options['type']);
-				if (!empty($data)) {
+				if ( ! empty($data)) {
 					curl_setopt($this->handle, CURLOPT_POSTFIELDS, $data);
 				}
 		}
@@ -375,7 +375,7 @@ 
 		curl_setopt($this->handle, CURLOPT_URL, $url);
 		curl_setopt($this->handle, CURLOPT_REFERER, $url);
 		curl_setopt($this->handle, CURLOPT_USERAGENT, $options['useragent']);
-		if (!empty($headers)) {
+		if ( ! empty($headers)) {
 			curl_setopt($this->handle, CURLOPT_HTTPHEADER, $headers);
 		}
 		if ($options['protocol_version'] === 1.1) {
@@ -496,7 +496,7 @@ 
 	 * @return string URL with data
 	 */
 	protected static function format_get($url, $data) {
-		if (!empty($data)) {
+		if ( ! empty($data)) {
 			$url_parts = parse_url($url);
 			if (empty($url_parts['query'])) {
 				$query = $url_parts['query'] = '';
@@ -505,11 +505,11 @@ 
 				$query = $url_parts['query'];
 			}
 
-			$query .= '&' . http_build_query($data, null, '&');
+			$query .= '&'.http_build_query($data, null, '&');
 			$query = trim($query, '&');
 
 			if (empty($url_parts['query'])) {
-				$url .= '?' . $query;
+				$url .= '?'.$query;
 			}
 			else {
 				$url = str_replace($url_parts['query'], $query, $url);
@@ -525,14 +525,14 @@ 
 	 * @return boolean True if the transport is valid, false otherwise.
 	 */
 	public static function test($capabilities = array()) {
-		if (!function_exists('curl_init') || !function_exists('curl_exec')) {
+		if ( ! function_exists('curl_init') || ! function_exists('curl_exec')) {
 			return false;
 		}
 
 		// If needed, check that our installed curl version supports SSL
 		if (isset($capabilities['ssl']) && $capabilities['ssl']) {
 			$curl_version = curl_version();
-			if (!(CURL_VERSION_SSL & $curl_version['features'])) {
+			if ( ! (CURL_VERSION_SSL & $curl_version['features'])) {
 				return false;
 			}
 		}