ntwb / wordpress

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/Hooks.php

Spacing +2 added lines, -2 removed lines

@@ -35,10 +35,10 @@
 	 * @param int $priority Priority number. <0 is executed earlier, >0 is executed later
 	 */
 	public function register($hook, $callback, $priority = 0) {
-		if (!isset($this->hooks[$hook])) {
+		if ( ! isset($this->hooks[$hook])) {
 			$this->hooks[$hook] = array();
 		}
-		if (!isset($this->hooks[$hook][$priority])) {
+		if ( ! isset($this->hooks[$hook][$priority])) {
 			$this->hooks[$hook][$priority] = array();
 		}
 

src/wp-includes/Requests/IPv6.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
 		}
 		// xxx::xxx
 		else {
-			$fill = ':' . str_repeat('0:', 6 - $c2 - $c1);
+			$fill = ':'.str_repeat('0:', 6 - $c2 - $c1);
 			$ip = str_replace('::', $fill, $ip);
 		}
 		return $ip;

Braces +3 added lines, -6 removed lines

@@ -106,8 +106,7 @@ 
 
 		if ($ip_parts[1] !== '') {
 			return implode(':', $ip_parts);
-		}
-		else {
+		} else {
 			return $ip_parts[0];
 		}
 	}
@@ -130,8 +129,7 @@ 
 			$ipv6_part = substr($ip, 0, $pos);
 			$ipv4_part = substr($ip, $pos + 1);
 			return array($ipv6_part, $ipv4_part);
-		}
-		else {
+		} else {
 			return array($ip, '');
 		}
 	}
@@ -182,8 +180,7 @@ 
 				}
 			}
 			return true;
-		}
-		else {
+		} else {
 			return false;
 		}
 	}

src/wp-includes/Requests/Utility/CaseInsensitiveDictionary.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 	 */
 	public function offsetGet($key) {
 		$key = strtolower($key);
-		if (!isset($this->data[$key])) {
+		if ( ! isset($this->data[$key])) {
 			return null;
 		}
 

src/wp-includes/random_compat/random_bytes_openssl.php

Indentation +36 added lines, -36 removed lines

@@ -41,43 +41,43 @@
  */
 function random_bytes($bytes)
 {
-    try {
-        $bytes = RandomCompat_intval($bytes);
-    } catch (TypeError $ex) {
-        throw new TypeError(
-            'random_bytes(): $bytes must be an integer'
-        );
-    }
+	try {
+		$bytes = RandomCompat_intval($bytes);
+	} catch (TypeError $ex) {
+		throw new TypeError(
+			'random_bytes(): $bytes must be an integer'
+		);
+	}
 
-    if ($bytes < 1) {
-        throw new Error(
-            'Length must be greater than 0'
-        );
-    }
+	if ($bytes < 1) {
+		throw new Error(
+			'Length must be greater than 0'
+		);
+	}
 
-    /**
-     * $secure is passed by reference. If it's set to false, fail. Note
-     * that this will only return false if this function fails to return
-     * any data.
-     * 
-     * @ref https://github.com/paragonie/random_compat/issues/6#issuecomment-119564973
-     */
-    $secure = true;
-    $buf = openssl_random_pseudo_bytes($bytes, $secure);
-    if (
-        $buf !== false
-        &&
-        $secure
-        &&
-        RandomCompat_strlen($buf) === $bytes
-    ) {
-        return $buf;
-    }
+	/**
+	 * $secure is passed by reference. If it's set to false, fail. Note
+	 * that this will only return false if this function fails to return
+	 * any data.
+	 * 
+	 * @ref https://github.com/paragonie/random_compat/issues/6#issuecomment-119564973
+	 */
+	$secure = true;
+	$buf = openssl_random_pseudo_bytes($bytes, $secure);
+	if (
+		$buf !== false
+		&&
+		$secure
+		&&
+		RandomCompat_strlen($buf) === $bytes
+	) {
+		return $buf;
+	}
 
-    /**
-     * If we reach here, PHP has failed us.
-     */
-    throw new Exception(
-        'Could not gather sufficient random data'
-    );
+	/**
+	 * If we reach here, PHP has failed us.
+	 */
+	throw new Exception(
+		'Could not gather sufficient random data'
+	);
 }

src/wp-includes/random_compat/random_bytes_com_dotnet.php

Indentation +35 added lines, -35 removed lines

@@ -39,43 +39,43 @@
  */
 function random_bytes($bytes)
 {
-    try {
-        $bytes = RandomCompat_intval($bytes);
-    } catch (TypeError $ex) {
-        throw new TypeError(
-            'random_bytes(): $bytes must be an integer'
-        );
-    }
+	try {
+		$bytes = RandomCompat_intval($bytes);
+	} catch (TypeError $ex) {
+		throw new TypeError(
+			'random_bytes(): $bytes must be an integer'
+		);
+	}
 
-    if ($bytes < 1) {
-        throw new Error(
-            'Length must be greater than 0'
-        );
-    }
+	if ($bytes < 1) {
+		throw new Error(
+			'Length must be greater than 0'
+		);
+	}
 
-    $buf = '';
-    $util = new COM('CAPICOM.Utilities.1');
-    $execCount = 0;
+	$buf = '';
+	$util = new COM('CAPICOM.Utilities.1');
+	$execCount = 0;
 
-    /**
-     * Let's not let it loop forever. If we run N times and fail to
-     * get N bytes of random data, then CAPICOM has failed us.
-     */
-    do {
-        $buf .= base64_decode($util->GetRandom($bytes, 0));
-        if (RandomCompat_strlen($buf) >= $bytes) {
-            /**
-             * Return our random entropy buffer here:
-             */
-            return RandomCompat_substr($buf, 0, $bytes);
-        }
-        ++$execCount; 
-    } while ($execCount < $bytes);
+	/**
+	 * Let's not let it loop forever. If we run N times and fail to
+	 * get N bytes of random data, then CAPICOM has failed us.
+	 */
+	do {
+		$buf .= base64_decode($util->GetRandom($bytes, 0));
+		if (RandomCompat_strlen($buf) >= $bytes) {
+			/**
+			 * Return our random entropy buffer here:
+			 */
+			return RandomCompat_substr($buf, 0, $bytes);
+		}
+		++$execCount; 
+	} while ($execCount < $bytes);
 
-    /**
-     * If we reach here, PHP has failed us.
-     */
-    throw new Exception(
-        'Could not gather sufficient random data'
-    );
+	/**
+	 * If we reach here, PHP has failed us.
+	 */
+	throw new Exception(
+		'Could not gather sufficient random data'
+	);
 }

src/wp-includes/random_compat/random_bytes_libsodium_legacy.php

Indentation +38 added lines, -38 removed lines

@@ -41,46 +41,46 @@
  */
 function random_bytes($bytes)
 {
-    try {
-        $bytes = RandomCompat_intval($bytes);
-    } catch (TypeError $ex) {
-        throw new TypeError(
-            'random_bytes(): $bytes must be an integer'
-        );
-    }
+	try {
+		$bytes = RandomCompat_intval($bytes);
+	} catch (TypeError $ex) {
+		throw new TypeError(
+			'random_bytes(): $bytes must be an integer'
+		);
+	}
 
-    if ($bytes < 1) {
-        throw new Error(
-            'Length must be greater than 0'
-        );
-    }
+	if ($bytes < 1) {
+		throw new Error(
+			'Length must be greater than 0'
+		);
+	}
 
-    /**
-     * \Sodium\randombytes_buf() doesn't allow more than 2147483647 bytes to be
-     * generated in one invocation.
-     */
-    if ($bytes > 2147483647) {
-        $buf = '';
-        for ($i = 0; $i < $bytes; $i += 1073741824) {
-            $n = ($bytes - $i) > 1073741824
-                ? 1073741824
-                : $bytes - $i;
-            $buf .= Sodium::randombytes_buf($n);
-        }
-    } else {
-        $buf = Sodium::randombytes_buf($bytes);
-    }
+	/**
+	 * \Sodium\randombytes_buf() doesn't allow more than 2147483647 bytes to be
+	 * generated in one invocation.
+	 */
+	if ($bytes > 2147483647) {
+		$buf = '';
+		for ($i = 0; $i < $bytes; $i += 1073741824) {
+			$n = ($bytes - $i) > 1073741824
+				? 1073741824
+				: $bytes - $i;
+			$buf .= Sodium::randombytes_buf($n);
+		}
+	} else {
+		$buf = Sodium::randombytes_buf($bytes);
+	}
 
-    if ($buf !== false) {
-        if (RandomCompat_strlen($buf) === $bytes) {
-            return $buf;
-        }
-    }
+	if ($buf !== false) {
+		if (RandomCompat_strlen($buf) === $bytes) {
+			return $buf;
+		}
+	}
 
-    /**
-     * If we reach here, PHP has failed us.
-     */
-    throw new Exception(
-        'Could not gather sufficient random data'
-    );
+	/**
+	 * If we reach here, PHP has failed us.
+	 */
+	throw new Exception(
+		'Could not gather sufficient random data'
+	);
 }

src/wp-includes/random_compat/random_bytes_mcrypt.php

Indentation +29 added lines, -29 removed lines

@@ -41,36 +41,36 @@
  */
 function random_bytes($bytes)
 {
-    try {
-        $bytes = RandomCompat_intval($bytes);
-    } catch (TypeError $ex) {
-        throw new TypeError(
-            'random_bytes(): $bytes must be an integer'
-        );
-    }
+	try {
+		$bytes = RandomCompat_intval($bytes);
+	} catch (TypeError $ex) {
+		throw new TypeError(
+			'random_bytes(): $bytes must be an integer'
+		);
+	}
 
-    if ($bytes < 1) {
-        throw new Error(
-            'Length must be greater than 0'
-        );
-    }
+	if ($bytes < 1) {
+		throw new Error(
+			'Length must be greater than 0'
+		);
+	}
 
-    $buf = @mcrypt_create_iv($bytes, MCRYPT_DEV_URANDOM);
-    if (
-        $buf !== false
-        &&
-        RandomCompat_strlen($buf) === $bytes
-    ) {
-        /**
-         * Return our random entropy buffer here:
-         */
-        return $buf;
-    }
+	$buf = @mcrypt_create_iv($bytes, MCRYPT_DEV_URANDOM);
+	if (
+		$buf !== false
+		&&
+		RandomCompat_strlen($buf) === $bytes
+	) {
+		/**
+		 * Return our random entropy buffer here:
+		 */
+		return $buf;
+	}
 
-    /**
-     * If we reach here, PHP has failed us.
-     */
-    throw new Exception(
-        'Could not gather sufficient random data'
-    );
+	/**
+	 * If we reach here, PHP has failed us.
+	 */
+	throw new Exception(
+		'Could not gather sufficient random data'
+	);
 }