ntwb / wordpress

src/wp-includes/widgets/class-wp-widget-tag-cloud.php

Switch Indentation +29 added lines, -29 removed lines

@@ -128,38 +128,38 @@
 		switch ( count( $taxonomies ) ) {
 
 		// No tag cloud supporting taxonomies found, display error message
-		case 0:
-			echo '<p>' . __( 'The tag cloud will not be displayed since there are no taxonomies that support the tag cloud widget.' ) . '</p>';
-			printf( $input, '' );
-			break;
-
-		// Just a single tag cloud supporting taxonomy found, no need to display options
-		case 1:
-			$keys = array_keys( $taxonomies );
-			$taxonomy = reset( $keys );
-			printf( $input, esc_attr( $taxonomy ) );
-			break;
-
-		// More than one tag cloud supporting taxonomy found, display options
-		default:
-			printf(
-				'<p><label for="%1$s">%2$s</label>' .
-				'<select class="widefat" id="%1$s" name="%3$s">',
-				$id,
-				__( 'Taxonomy:' ),
-				$name
-			);
-
-			foreach ( $taxonomies as $taxonomy => $tax ) {
+			case 0:
+				echo '<p>' . __( 'The tag cloud will not be displayed since there are no taxonomies that support the tag cloud widget.' ) . '</p>';
+				printf( $input, '' );
+				break;
+
+			// Just a single tag cloud supporting taxonomy found, no need to display options
+			case 1:
+				$keys = array_keys( $taxonomies );
+				$taxonomy = reset( $keys );
+				printf( $input, esc_attr( $taxonomy ) );
+				break;
+
+			// More than one tag cloud supporting taxonomy found, display options
+			default:
 				printf(
-					'<option value="%s"%s>%s</option>',
-					esc_attr( $taxonomy ),
-					selected( $taxonomy, $current_taxonomy, false ),
-					$tax->labels->name
+					'<p><label for="%1$s">%2$s</label>' .
+					'<select class="widefat" id="%1$s" name="%3$s">',
+					$id,
+					__( 'Taxonomy:' ),
+					$name
 				);
-			}
 
-			echo '</select></p>';
+				foreach ( $taxonomies as $taxonomy => $tax ) {
+					printf(
+						'<option value="%s"%s>%s</option>',
+						esc_attr( $taxonomy ),
+						selected( $taxonomy, $current_taxonomy, false ),
+						$tax->labels->name
+					);
+				}
+
+				echo '</select></p>';
 		}
 	}
 

Braces +3 added lines, -2 removed lines

@@ -173,8 +173,9 @@
 	 * @return string Name of the current taxonomy if set, otherwise 'post_tag'.
 	 */
 	public function _get_current_taxonomy($instance) {
-		if ( !empty($instance['taxonomy']) && taxonomy_exists($instance['taxonomy']) )
-			return $instance['taxonomy'];
+		if ( !empty($instance['taxonomy']) && taxonomy_exists($instance['taxonomy']) ) {
+					return $instance['taxonomy'];
+		}
 
 		return 'post_tag';
 	}

Spacing +34 added lines, -34 removed lines

@@ -24,10 +24,10 @@ 
 	 */
 	public function __construct() {
 		$widget_ops = array(
-			'description' => __( 'A cloud of your most used tags.' ),
+			'description' => __('A cloud of your most used tags.'),
 			'customize_selective_refresh' => true,
 		);
-		parent::__construct( 'tag_cloud', __( 'Tag Cloud' ), $widget_ops );
+		parent::__construct('tag_cloud', __('Tag Cloud'), $widget_ops);
 	}
 
 	/**
@@ -40,12 +40,12 @@ 
 	 *                        'before_widget', and 'after_widget'.
 	 * @param array $instance Settings for the current Tag Cloud widget instance.
 	 */
-	public function widget( $args, $instance ) {
+	public function widget($args, $instance) {
 		$current_taxonomy = $this->_get_current_taxonomy($instance);
-		if ( !empty($instance['title']) ) {
+		if ( ! empty($instance['title'])) {
 			$title = $instance['title'];
 		} else {
-			if ( 'post_tag' == $current_taxonomy ) {
+			if ('post_tag' == $current_taxonomy) {
 				$title = __('Tags');
 			} else {
 				$tax = get_taxonomy($current_taxonomy);
@@ -63,21 +63,21 @@ 
 		 *
 		 * @param array $current_taxonomy The taxonomy to use in the tag cloud. Default 'tags'.
 		 */
-		$tag_cloud = wp_tag_cloud( apply_filters( 'widget_tag_cloud_args', array(
+		$tag_cloud = wp_tag_cloud(apply_filters('widget_tag_cloud_args', array(
 			'taxonomy' => $current_taxonomy,
 			'echo' => false
-		) ) );
+		)));
 
-		if ( empty( $tag_cloud ) ) {
+		if (empty($tag_cloud)) {
 			return;
 		}
 
 		/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
-		$title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
+		$title = apply_filters('widget_title', $title, $instance, $this->id_base);
 
 		echo $args['before_widget'];
-		if ( $title ) {
-			echo $args['before_title'] . $title . $args['after_title'];
+		if ($title) {
+			echo $args['before_title'].$title.$args['after_title'];
 		}
 
 		echo '<div class="tagcloud">';
@@ -99,9 +99,9 @@ 
 	 * @param array $old_instance Old settings for this instance.
 	 * @return array Settings to save or bool false to cancel saving.
 	 */
-	public function update( $new_instance, $old_instance ) {
+	public function update($new_instance, $old_instance) {
 		$instance = array();
-		$instance['title'] = sanitize_text_field( $new_instance['title'] );
+		$instance['title'] = sanitize_text_field($new_instance['title']);
 		$instance['taxonomy'] = stripslashes($new_instance['taxonomy']);
 		return $instance;
 	}
@@ -114,50 +114,50 @@ 
 	 *
 	 * @param array $instance Current settings.
 	 */
-	public function form( $instance ) {
+	public function form($instance) {
 		$current_taxonomy = $this->_get_current_taxonomy($instance);
-		$title_id = $this->get_field_id( 'title' );
-		$instance['title'] = ! empty( $instance['title'] ) ? esc_attr( $instance['title'] ) : '';
+		$title_id = $this->get_field_id('title');
+		$instance['title'] = ! empty($instance['title']) ? esc_attr($instance['title']) : '';
 
-		echo '<p><label for="' . $title_id .'">' . __( 'Title:' ) . '</label>
-			<input type="text" class="widefat" id="' . $title_id .'" name="' . $this->get_field_name( 'title' ) .'" value="' . $instance['title'] .'" />
+		echo '<p><label for="'.$title_id.'">'.__('Title:').'</label>
+			<input type="text" class="widefat" id="' . $title_id.'" name="'.$this->get_field_name('title').'" value="'.$instance['title'].'" />
 		</p>';
 
-		$taxonomies = get_taxonomies( array( 'show_tagcloud' => true ), 'object' );
-		$id = $this->get_field_id( 'taxonomy' );
-		$name = $this->get_field_name( 'taxonomy' );
-		$input = '<input type="hidden" id="' . $id . '" name="' . $name . '" value="%s" />';
+		$taxonomies = get_taxonomies(array('show_tagcloud' => true), 'object');
+		$id = $this->get_field_id('taxonomy');
+		$name = $this->get_field_name('taxonomy');
+		$input = '<input type="hidden" id="'.$id.'" name="'.$name.'" value="%s" />';
 
-		switch ( count( $taxonomies ) ) {
+		switch (count($taxonomies)) {
 
 		// No tag cloud supporting taxonomies found, display error message
 		case 0:
-			echo '<p>' . __( 'The tag cloud will not be displayed since there are no taxonomies that support the tag cloud widget.' ) . '</p>';
-			printf( $input, '' );
+			echo '<p>'.__('The tag cloud will not be displayed since there are no taxonomies that support the tag cloud widget.').'</p>';
+			printf($input, '');
 			break;
 
 		// Just a single tag cloud supporting taxonomy found, no need to display options
 		case 1:
-			$keys = array_keys( $taxonomies );
-			$taxonomy = reset( $keys );
-			printf( $input, esc_attr( $taxonomy ) );
+			$keys = array_keys($taxonomies);
+			$taxonomy = reset($keys);
+			printf($input, esc_attr($taxonomy));
 			break;
 
 		// More than one tag cloud supporting taxonomy found, display options
 		default:
 			printf(
-				'<p><label for="%1$s">%2$s</label>' .
+				'<p><label for="%1$s">%2$s</label>'.
 				'<select class="widefat" id="%1$s" name="%3$s">',
 				$id,
-				__( 'Taxonomy:' ),
+				__('Taxonomy:'),
 				$name
 			);
 
-			foreach ( $taxonomies as $taxonomy => $tax ) {
+			foreach ($taxonomies as $taxonomy => $tax) {
 				printf(
 					'<option value="%s"%s>%s</option>',
-					esc_attr( $taxonomy ),
-					selected( $taxonomy, $current_taxonomy, false ),
+					esc_attr($taxonomy),
+					selected($taxonomy, $current_taxonomy, false),
 					$tax->labels->name
 				);
 			}
@@ -176,7 +176,7 @@ 
 	 * @return string Name of the current taxonomy if set, otherwise 'post_tag'.
 	 */
 	public function _get_current_taxonomy($instance) {
-		if ( !empty($instance['taxonomy']) && taxonomy_exists($instance['taxonomy']) )
+		if ( ! empty($instance['taxonomy']) && taxonomy_exists($instance['taxonomy']))
 			return $instance['taxonomy'];
 
 		return 'post_tag';

src/wp-includes/class-wp-http-curl.php

Spacing +107 added lines, -107 removed lines

@@ -81,129 +81,129 @@ 
 			'headers' => array(), 'body' => null, 'cookies' => array()
 		);
 
-		$r = wp_parse_args( $args, $defaults );
+		$r = wp_parse_args($args, $defaults);
 
-		if ( isset( $r['headers']['User-Agent'] ) ) {
+		if (isset($r['headers']['User-Agent'])) {
 			$r['user-agent'] = $r['headers']['User-Agent'];
-			unset( $r['headers']['User-Agent'] );
-		} elseif ( isset( $r['headers']['user-agent'] ) ) {
+			unset($r['headers']['User-Agent']);
+		} elseif (isset($r['headers']['user-agent'])) {
 			$r['user-agent'] = $r['headers']['user-agent'];
-			unset( $r['headers']['user-agent'] );
+			unset($r['headers']['user-agent']);
 		}
 
 		// Construct Cookie: header if any cookies are set.
-		WP_Http::buildCookieHeader( $r );
+		WP_Http::buildCookieHeader($r);
 
 		$handle = curl_init();
 
 		// cURL offers really easy proxy support.
 		$proxy = new WP_HTTP_Proxy();
 
-		if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) {
+		if ($proxy->is_enabled() && $proxy->send_through_proxy($url)) {
 
-			curl_setopt( $handle, CURLOPT_PROXYTYPE, CURLPROXY_HTTP );
-			curl_setopt( $handle, CURLOPT_PROXY, $proxy->host() );
-			curl_setopt( $handle, CURLOPT_PROXYPORT, $proxy->port() );
+			curl_setopt($handle, CURLOPT_PROXYTYPE, CURLPROXY_HTTP);
+			curl_setopt($handle, CURLOPT_PROXY, $proxy->host());
+			curl_setopt($handle, CURLOPT_PROXYPORT, $proxy->port());
 
-			if ( $proxy->use_authentication() ) {
-				curl_setopt( $handle, CURLOPT_PROXYAUTH, CURLAUTH_ANY );
-				curl_setopt( $handle, CURLOPT_PROXYUSERPWD, $proxy->authentication() );
+			if ($proxy->use_authentication()) {
+				curl_setopt($handle, CURLOPT_PROXYAUTH, CURLAUTH_ANY);
+				curl_setopt($handle, CURLOPT_PROXYUSERPWD, $proxy->authentication());
 			}
 		}
 
 		$is_local = isset($r['local']) && $r['local'];
 		$ssl_verify = isset($r['sslverify']) && $r['sslverify'];
-		if ( $is_local ) {
+		if ($is_local) {
 			/** This filter is documented in wp-includes/class-wp-http-streams.php */
-			$ssl_verify = apply_filters( 'https_local_ssl_verify', $ssl_verify );
-		} elseif ( ! $is_local ) {
+			$ssl_verify = apply_filters('https_local_ssl_verify', $ssl_verify);
+		} elseif ( ! $is_local) {
 			/** This filter is documented in wp-includes/class-wp-http-streams.php */
-			$ssl_verify = apply_filters( 'https_ssl_verify', $ssl_verify );
+			$ssl_verify = apply_filters('https_ssl_verify', $ssl_verify);
 		}
 
 		/*
 		 * CURLOPT_TIMEOUT and CURLOPT_CONNECTTIMEOUT expect integers. Have to use ceil since.
 		 * a value of 0 will allow an unlimited timeout.
 		 */
-		$timeout = (int) ceil( $r['timeout'] );
-		curl_setopt( $handle, CURLOPT_CONNECTTIMEOUT, $timeout );
-		curl_setopt( $handle, CURLOPT_TIMEOUT, $timeout );
+		$timeout = (int) ceil($r['timeout']);
+		curl_setopt($handle, CURLOPT_CONNECTTIMEOUT, $timeout);
+		curl_setopt($handle, CURLOPT_TIMEOUT, $timeout);
 
-		curl_setopt( $handle, CURLOPT_URL, $url);
-		curl_setopt( $handle, CURLOPT_RETURNTRANSFER, true );
-		curl_setopt( $handle, CURLOPT_SSL_VERIFYHOST, ( $ssl_verify === true ) ? 2 : false );
-		curl_setopt( $handle, CURLOPT_SSL_VERIFYPEER, $ssl_verify );
+		curl_setopt($handle, CURLOPT_URL, $url);
+		curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($handle, CURLOPT_SSL_VERIFYHOST, ($ssl_verify === true) ? 2 : false);
+		curl_setopt($handle, CURLOPT_SSL_VERIFYPEER, $ssl_verify);
 
-		if ( $ssl_verify ) {
-			curl_setopt( $handle, CURLOPT_CAINFO, $r['sslcertificates'] );
+		if ($ssl_verify) {
+			curl_setopt($handle, CURLOPT_CAINFO, $r['sslcertificates']);
 		}
 
-		curl_setopt( $handle, CURLOPT_USERAGENT, $r['user-agent'] );
+		curl_setopt($handle, CURLOPT_USERAGENT, $r['user-agent']);
 
 		/*
 		 * The option doesn't work with safe mode or when open_basedir is set, and there's
 		 * a bug #17490 with redirected POST requests, so handle redirections outside Curl.
 		 */
-		curl_setopt( $handle, CURLOPT_FOLLOWLOCATION, false );
-		if ( defined( 'CURLOPT_PROTOCOLS' ) ) // PHP 5.2.10 / cURL 7.19.4
-			curl_setopt( $handle, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS );
+		curl_setopt($handle, CURLOPT_FOLLOWLOCATION, false);
+		if (defined('CURLOPT_PROTOCOLS')) // PHP 5.2.10 / cURL 7.19.4
+			curl_setopt($handle, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
 
-		switch ( $r['method'] ) {
+		switch ($r['method']) {
 			case 'HEAD':
-				curl_setopt( $handle, CURLOPT_NOBODY, true );
+				curl_setopt($handle, CURLOPT_NOBODY, true);
 				break;
 			case 'POST':
-				curl_setopt( $handle, CURLOPT_POST, true );
-				curl_setopt( $handle, CURLOPT_POSTFIELDS, $r['body'] );
+				curl_setopt($handle, CURLOPT_POST, true);
+				curl_setopt($handle, CURLOPT_POSTFIELDS, $r['body']);
 				break;
 			case 'PUT':
-				curl_setopt( $handle, CURLOPT_CUSTOMREQUEST, 'PUT' );
-				curl_setopt( $handle, CURLOPT_POSTFIELDS, $r['body'] );
+				curl_setopt($handle, CURLOPT_CUSTOMREQUEST, 'PUT');
+				curl_setopt($handle, CURLOPT_POSTFIELDS, $r['body']);
 				break;
 			default:
-				curl_setopt( $handle, CURLOPT_CUSTOMREQUEST, $r['method'] );
-				if ( ! is_null( $r['body'] ) )
-					curl_setopt( $handle, CURLOPT_POSTFIELDS, $r['body'] );
+				curl_setopt($handle, CURLOPT_CUSTOMREQUEST, $r['method']);
+				if ( ! is_null($r['body']))
+					curl_setopt($handle, CURLOPT_POSTFIELDS, $r['body']);
 				break;
 		}
 
-		if ( true === $r['blocking'] ) {
-			curl_setopt( $handle, CURLOPT_HEADERFUNCTION, array( $this, 'stream_headers' ) );
-			curl_setopt( $handle, CURLOPT_WRITEFUNCTION, array( $this, 'stream_body' ) );
+		if (true === $r['blocking']) {
+			curl_setopt($handle, CURLOPT_HEADERFUNCTION, array($this, 'stream_headers'));
+			curl_setopt($handle, CURLOPT_WRITEFUNCTION, array($this, 'stream_body'));
 		}
 
-		curl_setopt( $handle, CURLOPT_HEADER, false );
+		curl_setopt($handle, CURLOPT_HEADER, false);
 
-		if ( isset( $r['limit_response_size'] ) )
-			$this->max_body_length = intval( $r['limit_response_size'] );
+		if (isset($r['limit_response_size']))
+			$this->max_body_length = intval($r['limit_response_size']);
 		else
 			$this->max_body_length = false;
 
 		// If streaming to a file open a file handle, and setup our curl streaming handler.
-		if ( $r['stream'] ) {
-			if ( ! WP_DEBUG )
-				$this->stream_handle = @fopen( $r['filename'], 'w+' );
+		if ($r['stream']) {
+			if ( ! WP_DEBUG)
+				$this->stream_handle = @fopen($r['filename'], 'w+');
 			else
-				$this->stream_handle = fopen( $r['filename'], 'w+' );
-			if ( ! $this->stream_handle )
-				return new WP_Error( 'http_request_failed', sprintf( __( 'Could not open handle for fopen() to %s' ), $r['filename'] ) );
+				$this->stream_handle = fopen($r['filename'], 'w+');
+			if ( ! $this->stream_handle)
+				return new WP_Error('http_request_failed', sprintf(__('Could not open handle for fopen() to %s'), $r['filename']));
 		} else {
 			$this->stream_handle = false;
 		}
 
-		if ( !empty( $r['headers'] ) ) {
+		if ( ! empty($r['headers'])) {
 			// cURL expects full header strings in each element.
 			$headers = array();
-			foreach ( $r['headers'] as $name => $value ) {
+			foreach ($r['headers'] as $name => $value) {
 				$headers[] = "{$name}: $value";
 			}
-			curl_setopt( $handle, CURLOPT_HTTPHEADER, $headers );
+			curl_setopt($handle, CURLOPT_HTTPHEADER, $headers);
 		}
 
-		if ( $r['httpversion'] == '1.0' )
-			curl_setopt( $handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0 );
+		if ($r['httpversion'] == '1.0')
+			curl_setopt($handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
 		else
-			curl_setopt( $handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1 );
+			curl_setopt($handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
 
 		/**
 		 * Fires before the cURL request is executed.
@@ -217,27 +217,27 @@ 
 		 * @param array    $r       The HTTP request arguments.
 		 * @param string   $url     The request URL.
 		 */
-		do_action_ref_array( 'http_api_curl', array( &$handle, $r, $url ) );
+		do_action_ref_array('http_api_curl', array(&$handle, $r, $url));
 
 		// We don't need to return the body, so don't. Just execute request and return.
-		if ( ! $r['blocking'] ) {
-			curl_exec( $handle );
+		if ( ! $r['blocking']) {
+			curl_exec($handle);
 
-			if ( $curl_error = curl_error( $handle ) ) {
-				curl_close( $handle );
-				return new WP_Error( 'http_request_failed', $curl_error );
+			if ($curl_error = curl_error($handle)) {
+				curl_close($handle);
+				return new WP_Error('http_request_failed', $curl_error);
 			}
-			if ( in_array( curl_getinfo( $handle, CURLINFO_HTTP_CODE ), array( 301, 302 ) ) ) {
-				curl_close( $handle );
-				return new WP_Error( 'http_request_failed', __( 'Too many redirects.' ) );
+			if (in_array(curl_getinfo($handle, CURLINFO_HTTP_CODE), array(301, 302))) {
+				curl_close($handle);
+				return new WP_Error('http_request_failed', __('Too many redirects.'));
 			}
 
-			curl_close( $handle );
-			return array( 'headers' => array(), 'body' => '', 'response' => array('code' => false, 'message' => false), 'cookies' => array() );
+			curl_close($handle);
+			return array('headers' => array(), 'body' => '', 'response' => array('code' => false, 'message' => false), 'cookies' => array());
 		}
 
-		curl_exec( $handle );
-		$theHeaders = WP_Http::processHeaders( $this->headers, $url );
+		curl_exec($handle);
+		$theHeaders = WP_Http::processHeaders($this->headers, $url);
 		$theBody = $this->body;
 		$bytes_written_total = $this->bytes_written_total;
 
@@ -245,37 +245,37 @@ 
 		$this->body = '';
 		$this->bytes_written_total = 0;
 
-		$curl_error = curl_errno( $handle );
+		$curl_error = curl_errno($handle);
 
 		// If an error occurred, or, no response.
-		if ( $curl_error || ( 0 == strlen( $theBody ) && empty( $theHeaders['headers'] ) ) ) {
-			if ( CURLE_WRITE_ERROR /* 23 */ == $curl_error ) {
-				if ( ! $this->max_body_length || $this->max_body_length != $bytes_written_total ) {
-					if ( $r['stream'] ) {
-						curl_close( $handle );
-						fclose( $this->stream_handle );
-						return new WP_Error( 'http_request_failed', __( 'Failed to write request to temporary file.' ) );
+		if ($curl_error || (0 == strlen($theBody) && empty($theHeaders['headers']))) {
+			if (CURLE_WRITE_ERROR /* 23 */ == $curl_error) {
+				if ( ! $this->max_body_length || $this->max_body_length != $bytes_written_total) {
+					if ($r['stream']) {
+						curl_close($handle);
+						fclose($this->stream_handle);
+						return new WP_Error('http_request_failed', __('Failed to write request to temporary file.'));
 					} else {
-						curl_close( $handle );
-						return new WP_Error( 'http_request_failed', curl_error( $handle ) );
+						curl_close($handle);
+						return new WP_Error('http_request_failed', curl_error($handle));
 					}
 				}
 			} else {
-				if ( $curl_error = curl_error( $handle ) ) {
-					curl_close( $handle );
-					return new WP_Error( 'http_request_failed', $curl_error );
+				if ($curl_error = curl_error($handle)) {
+					curl_close($handle);
+					return new WP_Error('http_request_failed', $curl_error);
 				}
 			}
-			if ( in_array( curl_getinfo( $handle, CURLINFO_HTTP_CODE ), array( 301, 302 ) ) ) {
-				curl_close( $handle );
-				return new WP_Error( 'http_request_failed', __( 'Too many redirects.' ) );
+			if (in_array(curl_getinfo($handle, CURLINFO_HTTP_CODE), array(301, 302))) {
+				curl_close($handle);
+				return new WP_Error('http_request_failed', __('Too many redirects.'));
 			}
 		}
 
-		curl_close( $handle );
+		curl_close($handle);
 
-		if ( $r['stream'] )
-			fclose( $this->stream_handle );
+		if ($r['stream'])
+			fclose($this->stream_handle);
 
 		$response = array(
 			'headers' => $theHeaders['headers'],
@@ -286,11 +286,11 @@ 
 		);
 
 		// Handle redirects.
-		if ( false !== ( $redirect_response = WP_HTTP::handle_redirects( $url, $r, $response ) ) )
+		if (false !== ($redirect_response = WP_HTTP::handle_redirects($url, $r, $response)))
 			return $redirect_response;
 
-		if ( true === $r['decompress'] && true === WP_Http_Encoding::should_decode($theHeaders['headers']) )
-			$theBody = WP_Http_Encoding::decompress( $theBody );
+		if (true === $r['decompress'] && true === WP_Http_Encoding::should_decode($theHeaders['headers']))
+			$theBody = WP_Http_Encoding::decompress($theBody);
 
 		$response['body'] = $theBody;
 
@@ -310,9 +310,9 @@ 
 	 * @param string   $headers cURL request headers.
 	 * @return int Length of the request headers.
 	 */
-	private function stream_headers( $handle, $headers ) {
+	private function stream_headers($handle, $headers) {
 		$this->headers .= $headers;
-		return strlen( $headers );
+		return strlen($headers);
 	}
 
 	/**
@@ -329,16 +329,16 @@ 
 	 * @param string   $data    cURL request body.
 	 * @return int Total bytes of data written.
 	 */
-	private function stream_body( $handle, $data ) {
-		$data_length = strlen( $data );
+	private function stream_body($handle, $data) {
+		$data_length = strlen($data);
 
-		if ( $this->max_body_length && ( $this->bytes_written_total + $data_length ) > $this->max_body_length ) {
-			$data_length = ( $this->max_body_length - $this->bytes_written_total );
-			$data = substr( $data, 0, $data_length );
+		if ($this->max_body_length && ($this->bytes_written_total + $data_length) > $this->max_body_length) {
+			$data_length = ($this->max_body_length - $this->bytes_written_total);
+			$data = substr($data, 0, $data_length);
 		}
 
-		if ( $this->stream_handle ) {
-			$bytes_written = fwrite( $this->stream_handle, $data );
+		if ($this->stream_handle) {
+			$bytes_written = fwrite($this->stream_handle, $data);
 		} else {
 			$this->body .= $data;
 			$bytes_written = $data_length;
@@ -359,16 +359,16 @@ 
 	 * @param array $args Optional. Array of request arguments. Default empty array.
 	 * @return bool False means this class can not be used, true means it can.
 	 */
-	public static function test( $args = array() ) {
-		if ( ! function_exists( 'curl_init' ) || ! function_exists( 'curl_exec' ) )
+	public static function test($args = array()) {
+		if ( ! function_exists('curl_init') || ! function_exists('curl_exec'))
 			return false;
 
-		$is_ssl = isset( $args['ssl'] ) && $args['ssl'];
+		$is_ssl = isset($args['ssl']) && $args['ssl'];
 
-		if ( $is_ssl ) {
+		if ($is_ssl) {
 			$curl_version = curl_version();
 			// Check whether this cURL version support SSL requests.
-			if ( ! (CURL_VERSION_SSL & $curl_version['features']) )
+			if ( ! (CURL_VERSION_SSL & $curl_version['features']))
 				return false;
 		}
 
@@ -380,6 +380,6 @@ 
 		 * @param bool  $use_class Whether the class can be used. Default true.
 		 * @param array $args      An array of request arguments.
 		 */
-		return apply_filters( 'use_curl_transport', true, $args );
+		return apply_filters('use_curl_transport', true, $args);
 	}
 }

Braces +39 added lines, -27 removed lines

@@ -145,8 +145,10 @@ 
 		 * a bug #17490 with redirected POST requests, so handle redirections outside Curl.
 		 */
 		curl_setopt( $handle, CURLOPT_FOLLOWLOCATION, false );
-		if ( defined( 'CURLOPT_PROTOCOLS' ) ) // PHP 5.2.10 / cURL 7.19.4
+		if ( defined( 'CURLOPT_PROTOCOLS' ) ) {
+			// PHP 5.2.10 / cURL 7.19.4
 			curl_setopt( $handle, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS );
+		}
 
 		switch ( $r['method'] ) {
 			case 'HEAD':
@@ -162,8 +164,9 @@ 
 				break;
 			default:
 				curl_setopt( $handle, CURLOPT_CUSTOMREQUEST, $r['method'] );
-				if ( ! is_null( $r['body'] ) )
-					curl_setopt( $handle, CURLOPT_POSTFIELDS, $r['body'] );
+				if ( ! is_null( $r['body'] ) ) {
+									curl_setopt( $handle, CURLOPT_POSTFIELDS, $r['body'] );
+				}
 				break;
 		}
 
@@ -174,19 +177,22 @@ 
 
 		curl_setopt( $handle, CURLOPT_HEADER, false );
 
-		if ( isset( $r['limit_response_size'] ) )
-			$this->max_body_length = intval( $r['limit_response_size'] );
-		else
-			$this->max_body_length = false;
+		if ( isset( $r['limit_response_size'] ) ) {
+					$this->max_body_length = intval( $r['limit_response_size'] );
+		} else {
+					$this->max_body_length = false;
+		}
 
 		// If streaming to a file open a file handle, and setup our curl streaming handler.
 		if ( $r['stream'] ) {
-			if ( ! WP_DEBUG )
-				$this->stream_handle = @fopen( $r['filename'], 'w+' );
-			else
-				$this->stream_handle = fopen( $r['filename'], 'w+' );
-			if ( ! $this->stream_handle )
-				return new WP_Error( 'http_request_failed', sprintf( __( 'Could not open handle for fopen() to %s' ), $r['filename'] ) );
+			if ( ! WP_DEBUG ) {
+							$this->stream_handle = @fopen( $r['filename'], 'w+' );
+			} else {
+							$this->stream_handle = fopen( $r['filename'], 'w+' );
+			}
+			if ( ! $this->stream_handle ) {
+							return new WP_Error( 'http_request_failed', sprintf( __( 'Could not open handle for fopen() to %s' ), $r['filename'] ) );
+			}
 		} else {
 			$this->stream_handle = false;
 		}
@@ -200,10 +206,11 @@ 
 			curl_setopt( $handle, CURLOPT_HTTPHEADER, $headers );
 		}
 
-		if ( $r['httpversion'] == '1.0' )
-			curl_setopt( $handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0 );
-		else
-			curl_setopt( $handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1 );
+		if ( $r['httpversion'] == '1.0' ) {
+					curl_setopt( $handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0 );
+		} else {
+					curl_setopt( $handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1 );
+		}
 
 		/**
 		 * Fires before the cURL request is executed.
@@ -274,8 +281,9 @@ 
 
 		curl_close( $handle );
 
-		if ( $r['stream'] )
-			fclose( $this->stream_handle );
+		if ( $r['stream'] ) {
+					fclose( $this->stream_handle );
+		}
 
 		$response = array(
 			'headers' => $theHeaders['headers'],
@@ -286,11 +294,13 @@ 
 		);
 
 		// Handle redirects.
-		if ( false !== ( $redirect_response = WP_HTTP::handle_redirects( $url, $r, $response ) ) )
-			return $redirect_response;
+		if ( false !== ( $redirect_response = WP_HTTP::handle_redirects( $url, $r, $response ) ) ) {
+					return $redirect_response;
+		}
 
-		if ( true === $r['decompress'] && true === WP_Http_Encoding::should_decode($theHeaders['headers']) )
-			$theBody = WP_Http_Encoding::decompress( $theBody );
+		if ( true === $r['decompress'] && true === WP_Http_Encoding::should_decode($theHeaders['headers']) ) {
+					$theBody = WP_Http_Encoding::decompress( $theBody );
+		}
 
 		$response['body'] = $theBody;
 
@@ -360,16 +370,18 @@ 
 	 * @return bool False means this class can not be used, true means it can.
 	 */
 	public static function test( $args = array() ) {
-		if ( ! function_exists( 'curl_init' ) || ! function_exists( 'curl_exec' ) )
-			return false;
+		if ( ! function_exists( 'curl_init' ) || ! function_exists( 'curl_exec' ) ) {
+					return false;
+		}
 
 		$is_ssl = isset( $args['ssl'] ) && $args['ssl'];
 
 		if ( $is_ssl ) {
 			$curl_version = curl_version();
 			// Check whether this cURL version support SSL requests.
-			if ( ! (CURL_VERSION_SSL & $curl_version['features']) )
-				return false;
+			if ( ! (CURL_VERSION_SSL & $curl_version['features']) ) {
+							return false;
+			}
 		}
 
 		/**

src/wp-includes/class-wp-http-response.php

Spacing +11 added lines, -11 removed lines

@@ -51,10 +51,10 @@ 
 	 * @param int   $status  Optional. HTTP status code. Default 200.
 	 * @param array $headers Optional. HTTP header map. Default empty array.
 	 */
-	public function __construct( $data = null, $status = 200, $headers = array() ) {
+	public function __construct($data = null, $status = 200, $headers = array()) {
 		$this->data = $data;
-		$this->set_status( $status );
-		$this->set_headers( $headers );
+		$this->set_status($status);
+		$this->set_headers($headers);
 	}
 
 	/**
@@ -77,7 +77,7 @@ 
 	 *
 	 * @param array $headers Map of header name to header value.
 	 */
-	public function set_headers( $headers ) {
+	public function set_headers($headers) {
 		$this->headers = $headers;
 	}
 
@@ -92,11 +92,11 @@ 
 	 * @param bool   $replace Optional. Whether to replace an existing header of the same name.
 	 *                        Default true.
 	 */
-	public function header( $key, $value, $replace = true ) {
-		if ( $replace || ! isset( $this->headers[ $key ] ) ) {
-			$this->headers[ $key ] = $value;
+	public function header($key, $value, $replace = true) {
+		if ($replace || ! isset($this->headers[$key])) {
+			$this->headers[$key] = $value;
 		} else {
-			$this->headers[ $key ] .= ', ' . $value;
+			$this->headers[$key] .= ', '.$value;
 		}
 	}
 
@@ -120,8 +120,8 @@ 
 	 *
 	 * @param int $code HTTP status.
 	 */
-	public function set_status( $code ) {
-		$this->status = absint( $code );
+	public function set_status($code) {
+		$this->status = absint($code);
 	}
 
 	/**
@@ -144,7 +144,7 @@ 
 	 *
 	 * @param mixed $data Response data.
 	 */
-	public function set_data( $data ) {
+	public function set_data($data) {
 		$this->data = $data;
 	}
 

src/wp-includes/SimplePie/Category.php

Braces +3 added lines, -6 removed lines

@@ -113,8 +113,7 @@ 
 		if ($this->name !== null)
 		{
 			return $this->name;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -130,8 +129,7 @@ 
 		if ($this->link !== null)
 		{
 			return $this->link;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -147,8 +145,7 @@ 
 		if ($this->email !== null)
 		{
 			return $this->email;
-		}
-		else
+		} else
 		{
 			return null;
 		}

src/wp-includes/SimplePie/Credit.php

Braces +3 added lines, -6 removed lines

@@ -113,8 +113,7 @@ 
 		if ($this->name !== null)
 		{
 			return $this->name;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -130,8 +129,7 @@ 
 		if ($this->link !== null)
 		{
 			return $this->link;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -147,8 +145,7 @@ 
 		if ($this->email !== null)
 		{
 			return $this->email;
-		}
-		else
+		} else
 		{
 			return null;
 		}

src/wp-includes/SimplePie/Restriction.php

Braces +3 added lines, -6 removed lines

@@ -113,8 +113,7 @@ 
 		if ($this->name !== null)
 		{
 			return $this->name;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -130,8 +129,7 @@ 
 		if ($this->link !== null)
 		{
 			return $this->link;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -147,8 +145,7 @@ 
 		if ($this->email !== null)
 		{
 			return $this->email;
-		}
-		else
+		} else
 		{
 			return null;
 		}

src/wp-includes/SimplePie/Copyright.php

Braces +2 added lines, -4 removed lines

@@ -103,8 +103,7 @@ 
 		if ($this->scheme !== null)
 		{
 			return $this->scheme;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -120,8 +119,7 @@ 
 		if ($this->value !== null)
 		{
 			return $this->value;
-		}
-		else
+		} else
 		{
 			return null;
 		}

src/wp-includes/class-walker-page-dropdown.php

Braces +3 added lines, -2 removed lines

@@ -58,8 +58,9 @@
 		}
 
 		$output .= "\t<option class=\"level-$depth\" value=\"" . esc_attr( $page->{$args['value_field']} ) . "\"";
-		if ( $page->ID == $args['selected'] )
-			$output .= ' selected="selected"';
+		if ( $page->ID == $args['selected'] ) {
+					$output .= ' selected="selected"';
+		}
 		$output .= '>';
 
 		$title = $page->post_title;

Spacing +9 added lines, -9 removed lines

@@ -37,7 +37,7 @@ 
 	 * @see Walker::$db_fields
 	 * @todo Decouple this
 	 */
-	public $db_fields = array( 'parent' => 'post_parent', 'id' => 'ID' );
+	public $db_fields = array('parent' => 'post_parent', 'id' => 'ID');
 
 	/**
 	 * Starts the element output.
@@ -56,22 +56,22 @@ 
 	 *                        attribute. See wp_dropdown_pages(). Default empty array.
 	 * @param int     $id     Optional. ID of the current page. Default 0 (unused).
 	 */
-	public function start_el( &$output, $page, $depth = 0, $args = array(), $id = 0 ) {
+	public function start_el(&$output, $page, $depth = 0, $args = array(), $id = 0) {
 		$pad = str_repeat(' ', $depth * 3);
 
-		if ( ! isset( $args['value_field'] ) || ! isset( $page->{$args['value_field']} ) ) {
+		if ( ! isset($args['value_field']) || ! isset($page->{$args['value_field']} )) {
 			$args['value_field'] = 'ID';
 		}
 
-		$output .= "\t<option class=\"level-$depth\" value=\"" . esc_attr( $page->{$args['value_field']} ) . "\"";
-		if ( $page->ID == $args['selected'] )
+		$output .= "\t<option class=\"level-$depth\" value=\"".esc_attr($page->{$args['value_field']} )."\"";
+		if ($page->ID == $args['selected'])
 			$output .= ' selected="selected"';
 		$output .= '>';
 
 		$title = $page->post_title;
-		if ( '' === $title ) {
+		if ('' === $title) {
 			/* translators: %d: ID of a post */
-			$title = sprintf( __( '#%d (no title)' ), $page->ID );
+			$title = sprintf(__('#%d (no title)'), $page->ID);
 		}
 
 		/**
@@ -82,9 +82,9 @@ 
 		 * @param string $title Page title.
 		 * @param object $page  Page data object.
 		 */
-		$title = apply_filters( 'list_pages', $title, $page );
+		$title = apply_filters('list_pages', $title, $page);
 
-		$output .= $pad . esc_html( $title );
+		$output .= $pad.esc_html($title);
 		$output .= "</option>\n";
 	}
 }

src/wp-includes/rest-api/class-wp-rest-response.php

Spacing +37 added lines, -37 removed lines

@@ -59,17 +59,17 @@ 
 	 * @param string $href       Target URI for the link.
 	 * @param array  $attributes Optional. Link parameters to send along with the URL. Default empty array.
 	 */
-	public function add_link( $rel, $href, $attributes = array() ) {
-		if ( empty( $this->links[ $rel ] ) ) {
-			$this->links[ $rel ] = array();
+	public function add_link($rel, $href, $attributes = array()) {
+		if (empty($this->links[$rel])) {
+			$this->links[$rel] = array();
 		}
 
-		if ( isset( $attributes['href'] ) ) {
+		if (isset($attributes['href'])) {
 			// Remove the href attribute, as it's used for the main URL.
-			unset( $attributes['href'] );
+			unset($attributes['href']);
 		}
 
-		$this->links[ $rel ][] = array(
+		$this->links[$rel][] = array(
 			'href'       => $href,
 			'attributes' => $attributes,
 		);
@@ -85,19 +85,19 @@ 
 	 * @param  string $href Optional. Only remove links for the relation matching the given href.
 	 *                      Default null.
 	 */
-	public function remove_link( $rel, $href = null ) {
-		if ( ! isset( $this->links[ $rel ] ) ) {
+	public function remove_link($rel, $href = null) {
+		if ( ! isset($this->links[$rel])) {
 			return;
 		}
 
-		if ( $href ) {
-			$this->links[ $rel ] = wp_list_filter( $this->links[ $rel ], array( 'href' => $href ), 'NOT' );
+		if ($href) {
+			$this->links[$rel] = wp_list_filter($this->links[$rel], array('href' => $href), 'NOT');
 		} else {
-			$this->links[ $rel ] = array();
+			$this->links[$rel] = array();
 		}
 
-		if ( ! $this->links[ $rel ] ) {
-			unset( $this->links[ $rel ] );
+		if ( ! $this->links[$rel]) {
+			unset($this->links[$rel]);
 		}
 	}
 
@@ -114,15 +114,15 @@ 
 	 *
 	 * @param array $links Map of link relation to list of links.
 	 */
-	public function add_links( $links ) {
-		foreach ( $links as $rel => $set ) {
+	public function add_links($links) {
+		foreach ($links as $rel => $set) {
 			// If it's a single link, wrap with an array for consistent handling.
-			if ( isset( $set['href'] ) ) {
-				$set = array( $set );
+			if (isset($set['href'])) {
+				$set = array($set);
 			}
 
-			foreach ( $set as $attributes ) {
-				$this->add_link( $rel, $attributes['href'], $attributes );
+			foreach ($set as $attributes) {
+				$this->add_link($rel, $attributes['href'], $attributes);
 			}
 		}
 	}
@@ -155,16 +155,16 @@ 
 	 * @param array  $other Optional. Other parameters to send, as an assocative array.
 	 *                      Default empty array.
 	 */
-	public function link_header( $rel, $link, $other = array() ) {
-		$header = '<' . $link . '>; rel="' . $rel . '"';
+	public function link_header($rel, $link, $other = array()) {
+		$header = '<'.$link.'>; rel="'.$rel.'"';
 
-		foreach ( $other as $key => $value ) {
-			if ( 'title' === $key ) {
-				$value = '"' . $value . '"';
+		foreach ($other as $key => $value) {
+			if ('title' === $key) {
+				$value = '"'.$value.'"';
 			}
-			$header .= '; ' . $key . '=' . $value;
+			$header .= '; '.$key.'='.$value;
 		}
-		$this->header( 'Link', $header, false );
+		$this->header('Link', $header, false);
 	}
 
 	/**
@@ -187,7 +187,7 @@ 
 	 *
 	 * @param string $route Route name.
 	 */
-	public function set_matched_route( $route ) {
+	public function set_matched_route($route) {
 		$this->matched_route = $route;
 	}
 
@@ -211,7 +211,7 @@ 
 	 *
 	 * @param array $handler The matched handler.
 	 */
-	public function set_matched_handler( $handler ) {
+	public function set_matched_handler($handler) {
 		$this->matched_handler = $handler;
 	}
 
@@ -236,22 +236,22 @@ 
 	 * @return WP_Error|null WP_Error or null on not an errored response.
 	 */
 	public function as_error() {
-		if ( ! $this->is_error() ) {
+		if ( ! $this->is_error()) {
 			return null;
 		}
 
 		$error = new WP_Error;
 
-		if ( is_array( $this->get_data() ) ) {
+		if (is_array($this->get_data())) {
 			$data = $this->get_data();
-			$error->add( $data['code'], $data['message'], $data['data'] );
-			if ( ! empty( $data['additional_errors'] ) ) {
-				foreach( $data['additional_errors'] as $err ) {
-					$error->add( $err['code'], $err['message'], $err['data'] );
+			$error->add($data['code'], $data['message'], $data['data']);
+			if ( ! empty($data['additional_errors'])) {
+				foreach ($data['additional_errors'] as $err) {
+					$error->add($err['code'], $err['message'], $err['data']);
 				}
 			}
 		} else {
-			$error->add( $this->get_status(), '', array( 'status' => $this->get_status() ) );
+			$error->add($this->get_status(), '', array('status' => $this->get_status()));
 		}
 
 		return $error;
@@ -299,7 +299,7 @@ 
 		 *
 		 * @param array $additional Additional CURIEs to register with the API.
 		 */
-		$additional = apply_filters( 'rest_response_link_curies', array() );
-		return array_merge( $curies, $additional );
+		$additional = apply_filters('rest_response_link_curies', array());
+		return array_merge($curies, $additional);
 	}
 }