ntwb / wordpress

src/wp-includes/embed.php

Braces +6 added lines, -4 removed lines

@@ -61,11 +61,13 @@
  * @return array Default embed parameters.
  */
 function wp_embed_defaults( $url = '' ) {
-	if ( ! empty( $GLOBALS['content_width'] ) )
-		$width = (int) $GLOBALS['content_width'];
+	if ( ! empty( $GLOBALS['content_width'] ) ) {
+			$width = (int) $GLOBALS['content_width'];
+	}
 
-	if ( empty( $width ) )
-		$width = 500;
+	if ( empty( $width ) ) {
+			$width = 500;
+	}
 
 	$height = min( ceil( $width * 1.5 ), 1000 );
 

Doc Comments +1 added lines, -1 removed lines

@@ -481,7 +481,7 @@
  *
  * @param WP_Post|int $post  Post object or ID.
  * @param int         $width The requested width.
- * @return array|false Response data on success, false if post doesn't exist.
+ * @return string Response data on success, false if post doesn't exist.
  */
 function get_oembed_response_data( $post, $width ) {
 	$post  = get_post( $post );

Spacing +188 added lines, -188 removed lines

@@ -22,9 +22,9 @@ 
  * @param int      $priority Optional. Used to specify the order in which the registered handlers will
  *                           be tested. Default 10.
  */
-function wp_embed_register_handler( $id, $regex, $callback, $priority = 10 ) {
+function wp_embed_register_handler($id, $regex, $callback, $priority = 10) {
 	global $wp_embed;
-	$wp_embed->register_handler( $id, $regex, $callback, $priority );
+	$wp_embed->register_handler($id, $regex, $callback, $priority);
 }
 
 /**
@@ -37,9 +37,9 @@ 
  * @param string $id       The handler ID that should be removed.
  * @param int    $priority Optional. The priority of the handler to be removed. Default 10.
  */
-function wp_embed_unregister_handler( $id, $priority = 10 ) {
+function wp_embed_unregister_handler($id, $priority = 10) {
 	global $wp_embed;
-	$wp_embed->unregister_handler( $id, $priority );
+	$wp_embed->unregister_handler($id, $priority);
 }
 
 /**
@@ -60,14 +60,14 @@ 
  *
  * @return array Default embed parameters.
  */
-function wp_embed_defaults( $url = '' ) {
-	if ( ! empty( $GLOBALS['content_width'] ) )
+function wp_embed_defaults($url = '') {
+	if ( ! empty($GLOBALS['content_width']))
 		$width = (int) $GLOBALS['content_width'];
 
-	if ( empty( $width ) )
+	if (empty($width))
 		$width = 500;
 
-	$height = min( ceil( $width * 1.5 ), 1000 );
+	$height = min(ceil($width * 1.5), 1000);
 
 	/**
 	 * Filters the default array of embed dimensions.
@@ -78,7 +78,7 @@ 
 	 *                     in pixels (in that order).
 	 * @param string $url  The URL that should be embedded.
 	 */
-	return apply_filters( 'embed_defaults', compact( 'width', 'height' ), $url );
+	return apply_filters('embed_defaults', compact('width', 'height'), $url);
 }
 
 /**
@@ -93,9 +93,9 @@ 
  *                     Default empty.
  * @return false|string False on failure or the embed HTML on success.
  */
-function wp_oembed_get( $url, $args = '' ) {
+function wp_oembed_get($url, $args = '') {
 	$oembed = _wp_oembed_get_object();
-	return $oembed->get_html( $url, $args );
+	return $oembed->get_html($url, $args);
 }
 
 /**
@@ -111,7 +111,7 @@ 
 function _wp_oembed_get_object() {
 	static $wp_oembed = null;
 
-	if ( is_null( $wp_oembed ) ) {
+	if (is_null($wp_oembed)) {
 		$wp_oembed = new WP_oEmbed();
 	}
 	return $wp_oembed;
@@ -129,12 +129,12 @@ 
  * @param string  $provider The URL to the oEmbed provider.
  * @param boolean $regex    Optional. Whether the `$format` parameter is in a RegEx format. Default false.
  */
-function wp_oembed_add_provider( $format, $provider, $regex = false ) {
-	if ( did_action( 'plugins_loaded' ) ) {
+function wp_oembed_add_provider($format, $provider, $regex = false) {
+	if (did_action('plugins_loaded')) {
 		$oembed = _wp_oembed_get_object();
-		$oembed->providers[$format] = array( $provider, $regex );
+		$oembed->providers[$format] = array($provider, $regex);
 	} else {
-		WP_oEmbed::_add_provider_early( $format, $provider, $regex );
+		WP_oEmbed::_add_provider_early($format, $provider, $regex);
 	}
 }
 
@@ -148,16 +148,16 @@ 
  * @param string $format The URL format for the oEmbed provider to remove.
  * @return bool Was the provider removed successfully?
  */
-function wp_oembed_remove_provider( $format ) {
-	if ( did_action( 'plugins_loaded' ) ) {
+function wp_oembed_remove_provider($format) {
+	if (did_action('plugins_loaded')) {
 		$oembed = _wp_oembed_get_object();
 
-		if ( isset( $oembed->providers[ $format ] ) ) {
-			unset( $oembed->providers[ $format ] );
+		if (isset($oembed->providers[$format])) {
+			unset($oembed->providers[$format]);
 			return true;
 		}
 	} else {
-		WP_oEmbed::_remove_provider_early( $format );
+		WP_oEmbed::_remove_provider_early($format);
 	}
 
 	return false;
@@ -183,11 +183,11 @@ 
 	 *
 	 * @param bool $maybe_load_embeds Whether to load the embeds library. Default true.
 	 */
-	if ( ! apply_filters( 'load_default_embeds', true ) ) {
+	if ( ! apply_filters('load_default_embeds', true)) {
 		return;
 	}
 
-	wp_embed_register_handler( 'youtube_embed_url', '#https?://(www.)?youtube\.com/(?:v|embed)/([^/]+)#i', 'wp_embed_handler_youtube' );
+	wp_embed_register_handler('youtube_embed_url', '#https?://(www.)?youtube\.com/(?:v|embed)/([^/]+)#i', 'wp_embed_handler_youtube');
 
 	/**
 	 * Filters the audio embed handler callback.
@@ -196,7 +196,7 @@ 
 	 *
 	 * @param callable $handler Audio embed handler callback function.
 	 */
-	wp_embed_register_handler( 'audio', '#^https?://.+?\.(' . join( '|', wp_get_audio_extensions() ) . ')$#i', apply_filters( 'wp_audio_embed_handler', 'wp_embed_handler_audio' ), 9999 );
+	wp_embed_register_handler('audio', '#^https?://.+?\.('.join('|', wp_get_audio_extensions()).')$#i', apply_filters('wp_audio_embed_handler', 'wp_embed_handler_audio'), 9999);
 
 	/**
 	 * Filters the video embed handler callback.
@@ -205,7 +205,7 @@ 
 	 *
 	 * @param callable $handler Video embed handler callback function.
 	 */
-	wp_embed_register_handler( 'video', '#^https?://.+?\.(' . join( '|', wp_get_video_extensions() ) . ')$#i', apply_filters( 'wp_video_embed_handler', 'wp_embed_handler_video' ), 9999 );
+	wp_embed_register_handler('video', '#^https?://.+?\.('.join('|', wp_get_video_extensions()).')$#i', apply_filters('wp_video_embed_handler', 'wp_embed_handler_video'), 9999);
 }
 
 /**
@@ -224,9 +224,9 @@ 
  * @param array  $rawattr The original unmodified attributes.
  * @return string The embed HTML.
  */
-function wp_embed_handler_youtube( $matches, $attr, $url, $rawattr ) {
+function wp_embed_handler_youtube($matches, $attr, $url, $rawattr) {
 	global $wp_embed;
-	$embed = $wp_embed->autoembed( sprintf( "https://youtube.com/watch?v=%s", urlencode( $matches[2] ) ) );
+	$embed = $wp_embed->autoembed(sprintf("https://youtube.com/watch?v=%s", urlencode($matches[2])));
 
 	/**
 	 * Filters the YoutTube embed output.
@@ -240,7 +240,7 @@ 
 	 * @param string $url     The original URL that was matched by the regex.
 	 * @param array  $rawattr The original unmodified attributes.
 	 */
-	return apply_filters( 'wp_embed_handler_youtube', $embed, $attr, $url, $rawattr );
+	return apply_filters('wp_embed_handler_youtube', $embed, $attr, $url, $rawattr);
 }
 
 /**
@@ -254,8 +254,8 @@ 
  * @param array  $rawattr The original unmodified attributes.
  * @return string The embed HTML.
  */
-function wp_embed_handler_audio( $matches, $attr, $url, $rawattr ) {
-	$audio = sprintf( '[audio src="%s" /]', esc_url( $url ) );
+function wp_embed_handler_audio($matches, $attr, $url, $rawattr) {
+	$audio = sprintf('[audio src="%s" /]', esc_url($url));
 
 	/**
 	 * Filters the audio embed output.
@@ -267,7 +267,7 @@ 
 	 * @param string $url     The original URL that was matched by the regex.
 	 * @param array  $rawattr The original unmodified attributes.
 	 */
-	return apply_filters( 'wp_embed_handler_audio', $audio, $attr, $url, $rawattr );
+	return apply_filters('wp_embed_handler_audio', $audio, $attr, $url, $rawattr);
 }
 
 /**
@@ -281,13 +281,13 @@ 
  * @param array  $rawattr The original unmodified attributes.
  * @return string The embed HTML.
  */
-function wp_embed_handler_video( $matches, $attr, $url, $rawattr ) {
+function wp_embed_handler_video($matches, $attr, $url, $rawattr) {
 	$dimensions = '';
-	if ( ! empty( $rawattr['width'] ) && ! empty( $rawattr['height'] ) ) {
-		$dimensions .= sprintf( 'width="%d" ', (int) $rawattr['width'] );
-		$dimensions .= sprintf( 'height="%d" ', (int) $rawattr['height'] );
+	if ( ! empty($rawattr['width']) && ! empty($rawattr['height'])) {
+		$dimensions .= sprintf('width="%d" ', (int) $rawattr['width']);
+		$dimensions .= sprintf('height="%d" ', (int) $rawattr['height']);
 	}
-	$video = sprintf( '[video %s src="%s" /]', $dimensions, esc_url( $url ) );
+	$video = sprintf('[video %s src="%s" /]', $dimensions, esc_url($url));
 
 	/**
 	 * Filters the video embed output.
@@ -299,7 +299,7 @@ 
 	 * @param string $url     The original URL that was matched by the regex.
 	 * @param array  $rawattr The original unmodified attributes.
 	 */
-	return apply_filters( 'wp_embed_handler_video', $video, $attr, $url, $rawattr );
+	return apply_filters('wp_embed_handler_video', $video, $attr, $url, $rawattr);
 }
 
 /**
@@ -320,11 +320,11 @@ 
 function wp_oembed_add_discovery_links() {
 	$output = '';
 
-	if ( is_singular() ) {
-		$output .= '<link rel="alternate" type="application/json+oembed" href="' . esc_url( get_oembed_endpoint_url( get_permalink() ) ) . '" />' . "\n";
+	if (is_singular()) {
+		$output .= '<link rel="alternate" type="application/json+oembed" href="'.esc_url(get_oembed_endpoint_url(get_permalink())).'" />'."\n";
 
-		if ( class_exists( 'SimpleXMLElement' ) ) {
-			$output .= '<link rel="alternate" type="text/xml+oembed" href="' . esc_url( get_oembed_endpoint_url( get_permalink(), 'xml' ) ) . '" />' . "\n";
+		if (class_exists('SimpleXMLElement')) {
+			$output .= '<link rel="alternate" type="text/xml+oembed" href="'.esc_url(get_oembed_endpoint_url(get_permalink(), 'xml')).'" />'."\n";
 		}
 	}
 
@@ -335,7 +335,7 @@ 
 	 *
 	 * @param string $output HTML of the discovery links.
 	 */
-	echo apply_filters( 'oembed_discovery_links', $output );
+	echo apply_filters('oembed_discovery_links', $output);
 }
 
 /**
@@ -344,7 +344,7 @@ 
  * @since 4.4.0
  */
 function wp_oembed_add_host_js() {
-	wp_enqueue_script( 'wp-embed' );
+	wp_enqueue_script('wp-embed');
 }
 
 /**
@@ -355,18 +355,18 @@ 
  * @param int|WP_Post $post Optional. Post ID or object. Defaults to the current post.
  * @return string|false The post embed URL on success, false if the post doesn't exist.
  */
-function get_post_embed_url( $post = null ) {
-	$post = get_post( $post );
+function get_post_embed_url($post = null) {
+	$post = get_post($post);
 
-	if ( ! $post ) {
+	if ( ! $post) {
 		return false;
 	}
 
-	$embed_url     = trailingslashit( get_permalink( $post ) ) . user_trailingslashit( 'embed' );
-	$path_conflict = get_page_by_path( str_replace( home_url(), '', $embed_url ), OBJECT, get_post_types( array( 'public' => true ) ) );
+	$embed_url     = trailingslashit(get_permalink($post)).user_trailingslashit('embed');
+	$path_conflict = get_page_by_path(str_replace(home_url(), '', $embed_url), OBJECT, get_post_types(array('public' => true)));
 
-	if ( ! get_option( 'permalink_structure' ) || $path_conflict ) {
-		$embed_url = add_query_arg( array( 'embed' => 'true' ), get_permalink( $post ) );
+	if ( ! get_option('permalink_structure') || $path_conflict) {
+		$embed_url = add_query_arg(array('embed' => 'true'), get_permalink($post));
 	}
 
 	/**
@@ -377,7 +377,7 @@ 
 	 * @param string  $embed_url The post embed URL.
 	 * @param WP_Post $post      The corresponding post object.
 	 */
-	return esc_url_raw( apply_filters( 'post_embed_url', $embed_url, $post ) );
+	return esc_url_raw(apply_filters('post_embed_url', $embed_url, $post));
 }
 
 /**
@@ -391,14 +391,14 @@ 
  * @param string $format    Optional. The requested response format. Default 'json'.
  * @return string The oEmbed endpoint URL.
  */
-function get_oembed_endpoint_url( $permalink = '', $format = 'json' ) {
-	$url = rest_url( 'oembed/1.0/embed' );
-
-	if ( '' !== $permalink ) {
-		$url = add_query_arg( array(
-			'url'    => urlencode( $permalink ),
-			'format' => ( 'json' !== $format ) ? $format : false,
-		), $url );
+function get_oembed_endpoint_url($permalink = '', $format = 'json') {
+	$url = rest_url('oembed/1.0/embed');
+
+	if ('' !== $permalink) {
+		$url = add_query_arg(array(
+			'url'    => urlencode($permalink),
+			'format' => ('json' !== $format) ? $format : false,
+		), $url);
 	}
 
 	/**
@@ -410,7 +410,7 @@ 
 	 * @param string $permalink The permalink used for the `url` query arg.
 	 * @param string $format    The requested response format.
 	 */
-	return apply_filters( 'oembed_endpoint_url', $url, $permalink, $format );
+	return apply_filters('oembed_endpoint_url', $url, $permalink, $format);
 }
 
 /**
@@ -423,21 +423,21 @@ 
  * @param int|WP_Post $post   Optional. Post ID or object. Default is global `$post`.
  * @return string|false Embed code on success, false if post doesn't exist.
  */
-function get_post_embed_html( $width, $height, $post = null ) {
-	$post = get_post( $post );
+function get_post_embed_html($width, $height, $post = null) {
+	$post = get_post($post);
 
-	if ( ! $post ) {
+	if ( ! $post) {
 		return false;
 	}
 
-	$embed_url = get_post_embed_url( $post );
+	$embed_url = get_post_embed_url($post);
 
-	$output = '<blockquote class="wp-embedded-content"><a href="' . esc_url( get_permalink( $post ) ) . '">' . get_the_title( $post ) . "</a></blockquote>\n";
+	$output = '<blockquote class="wp-embedded-content"><a href="'.esc_url(get_permalink($post)).'">'.get_the_title($post)."</a></blockquote>\n";
 
 	$output .= "<script type='text/javascript'>\n";
 	$output .= "<!--//--><![CDATA[//><!--\n";
-	if ( SCRIPT_DEBUG ) {
-		$output .= file_get_contents( ABSPATH . WPINC . '/js/wp-embed.js' );
+	if (SCRIPT_DEBUG) {
+		$output .= file_get_contents(ABSPATH.WPINC.'/js/wp-embed.js');
 	} else {
 		/*
 		 * If you're looking at a src version of this file, you'll see an "include"
@@ -449,7 +449,7 @@ 
 		 * minified JavaScript. If you need to debug it, please turn on SCRIPT_DEBUG
 		 * and edit wp-embed.js directly.
 		 */
-		$output .=<<<JS
+		$output .= <<<JS
 		include "js/wp-embed.min.js"
 JS;
 	}
@@ -458,15 +458,15 @@ 
 
 	$output .= sprintf(
 		'<iframe sandbox="allow-scripts" security="restricted" src="%1$s" width="%2$d" height="%3$d" title="%4$s" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" class="wp-embedded-content"></iframe>',
-		esc_url( $embed_url ),
-		absint( $width ),
-		absint( $height ),
+		esc_url($embed_url),
+		absint($width),
+		absint($height),
 		esc_attr(
 			sprintf(
 				/* translators: 1: post title, 2: site name */
-				__( '&#8220;%1$s&#8221; &#8212; %2$s' ),
-				get_the_title( $post ),
-				get_bloginfo( 'name' )
+				__('&#8220;%1$s&#8221; &#8212; %2$s'),
+				get_the_title($post),
+				get_bloginfo('name')
 			)
 		)
 	);
@@ -481,7 +481,7 @@ 
 	 * @param int     $width  Width of the response.
 	 * @param int     $height Height of the response.
 	 */
-	return apply_filters( 'embed_html', $output, $post, $width, $height );
+	return apply_filters('embed_html', $output, $post, $width, $height);
 }
 
 /**
@@ -493,15 +493,15 @@ 
  * @param int         $width The requested width.
  * @return array|false Response data on success, false if post doesn't exist.
  */
-function get_oembed_response_data( $post, $width ) {
-	$post  = get_post( $post );
-	$width = absint( $width );
+function get_oembed_response_data($post, $width) {
+	$post  = get_post($post);
+	$width = absint($width);
 
-	if ( ! $post ) {
+	if ( ! $post) {
 		return false;
 	}
 
-	if ( 'publish' !== get_post_status( $post ) ) {
+	if ('publish' !== get_post_status($post)) {
 		return false;
 	}
 
@@ -517,29 +517,29 @@ 
 	 *     @type int $max Maximum width. Default 600.
 	 * }
 	 */
-	$min_max_width = apply_filters( 'oembed_min_max_width', array(
+	$min_max_width = apply_filters('oembed_min_max_width', array(
 		'min' => 200,
 		'max' => 600
-	) );
+	));
 
-	$width  = min( max( $min_max_width['min'], $width ), $min_max_width['max'] );
-	$height = max( ceil( $width / 16 * 9 ), 200 );
+	$width  = min(max($min_max_width['min'], $width), $min_max_width['max']);
+	$height = max(ceil($width / 16 * 9), 200);
 
 	$data = array(
 		'version'       => '1.0',
-		'provider_name' => get_bloginfo( 'name' ),
+		'provider_name' => get_bloginfo('name'),
 		'provider_url'  => get_home_url(),
-		'author_name'   => get_bloginfo( 'name' ),
+		'author_name'   => get_bloginfo('name'),
 		'author_url'    => get_home_url(),
 		'title'         => $post->post_title,
 		'type'          => 'link',
 	);
 
-	$author = get_userdata( $post->post_author );
+	$author = get_userdata($post->post_author);
 
-	if ( $author ) {
+	if ($author) {
 		$data['author_name'] = $author->display_name;
-		$data['author_url']  = get_author_posts_url( $author->ID );
+		$data['author_url']  = get_author_posts_url($author->ID);
 	}
 
 	/**
@@ -552,7 +552,7 @@ 
 	 * @param int     $width  The requested width.
 	 * @param int     $height The calculated height.
 	 */
-	return apply_filters( 'oembed_response_data', $data, $post, $width, $height );
+	return apply_filters('oembed_response_data', $data, $post, $width, $height);
 }
 
 /**
@@ -566,30 +566,30 @@ 
  * @param int     $height The calculated height.
  * @return array The modified response data.
  */
-function get_oembed_response_data_rich( $data, $post, $width, $height ) {
-	$data['width']  = absint( $width );
-	$data['height'] = absint( $height );
+function get_oembed_response_data_rich($data, $post, $width, $height) {
+	$data['width']  = absint($width);
+	$data['height'] = absint($height);
 	$data['type']   = 'rich';
-	$data['html']   = get_post_embed_html( $width, $height, $post );
+	$data['html']   = get_post_embed_html($width, $height, $post);
 
 	// Add post thumbnail to response if available.
 	$thumbnail_id = false;
 
-	if ( has_post_thumbnail( $post->ID ) ) {
-		$thumbnail_id = get_post_thumbnail_id( $post->ID );
+	if (has_post_thumbnail($post->ID)) {
+		$thumbnail_id = get_post_thumbnail_id($post->ID);
 	}
 
-	if ( 'attachment' === get_post_type( $post ) ) {
-		if ( wp_attachment_is_image( $post ) ) {
+	if ('attachment' === get_post_type($post)) {
+		if (wp_attachment_is_image($post)) {
 			$thumbnail_id = $post->ID;
-		} else if ( wp_attachment_is( 'video', $post ) ) {
-			$thumbnail_id = get_post_thumbnail_id( $post );
+		} else if (wp_attachment_is('video', $post)) {
+			$thumbnail_id = get_post_thumbnail_id($post);
 			$data['type'] = 'video';
 		}
 	}
 
-	if ( $thumbnail_id ) {
-		list( $thumbnail_url, $thumbnail_width, $thumbnail_height ) = wp_get_attachment_image_src( $thumbnail_id, array( $width, 99999 ) );
+	if ($thumbnail_id) {
+		list($thumbnail_url, $thumbnail_width, $thumbnail_height) = wp_get_attachment_image_src($thumbnail_id, array($width, 99999));
 		$data['thumbnail_url']    = $thumbnail_url;
 		$data['thumbnail_width']  = $thumbnail_width;
 		$data['thumbnail_height'] = $thumbnail_height;
@@ -606,8 +606,8 @@ 
  * @param string $format The oEmbed response format. Accepts 'json' or 'xml'.
  * @return string The format, either 'xml' or 'json'. Default 'json'.
  */
-function wp_oembed_ensure_format( $format ) {
-	if ( ! in_array( $format, array( 'json', 'xml' ), true ) ) {
+function wp_oembed_ensure_format($format) {
+	if ( ! in_array($format, array('json', 'xml'), true)) {
 		return 'json';
 	}
 
@@ -629,35 +629,35 @@ 
  * @param WP_REST_Server            $server  Server instance.
  * @return true
  */
-function _oembed_rest_pre_serve_request( $served, $result, $request, $server ) {
+function _oembed_rest_pre_serve_request($served, $result, $request, $server) {
 	$params = $request->get_params();
 
-	if ( '/oembed/1.0/embed' !== $request->get_route() || 'GET' !== $request->get_method() ) {
+	if ('/oembed/1.0/embed' !== $request->get_route() || 'GET' !== $request->get_method()) {
 		return $served;
 	}
 
-	if ( ! isset( $params['format'] ) || 'xml' !== $params['format'] ) {
+	if ( ! isset($params['format']) || 'xml' !== $params['format']) {
 		return $served;
 	}
 
 	// Embed links inside the request.
-	$data = $server->response_to_data( $result, false );
+	$data = $server->response_to_data($result, false);
 
-	if ( ! class_exists( 'SimpleXMLElement' ) ) {
-		status_header( 501 );
-		die( get_status_header_desc( 501 ) );
+	if ( ! class_exists('SimpleXMLElement')) {
+		status_header(501);
+		die(get_status_header_desc(501));
 	}
 
-	$result = _oembed_create_xml( $data );
+	$result = _oembed_create_xml($data);
 
 	// Bail if there's no XML.
-	if ( ! $result ) {
-		status_header( 501 );
-		return get_status_header_desc( 501 );
+	if ( ! $result) {
+		status_header(501);
+		return get_status_header_desc(501);
 	}
 
-	if ( ! headers_sent() ) {
-		$server->send_header( 'Content-Type', 'text/xml; charset=' . get_option( 'blog_charset' ) );
+	if ( ! headers_sent()) {
+		$server->send_header('Content-Type', 'text/xml; charset='.get_option('blog_charset'));
 	}
 
 	echo $result;
@@ -675,25 +675,25 @@ 
  * @param SimpleXMLElement $node Optional. XML node to append the result to recursively.
  * @return string|false XML string on success, false on error.
  */
-function _oembed_create_xml( $data, $node = null ) {
-	if ( ! is_array( $data ) || empty( $data ) ) {
+function _oembed_create_xml($data, $node = null) {
+	if ( ! is_array($data) || empty($data)) {
 		return false;
 	}
 
-	if ( null === $node ) {
-		$node = new SimpleXMLElement( '<oembed></oembed>' );
+	if (null === $node) {
+		$node = new SimpleXMLElement('<oembed></oembed>');
 	}
 
-	foreach ( $data as $key => $value ) {
-		if ( is_numeric( $key ) ) {
+	foreach ($data as $key => $value) {
+		if (is_numeric($key)) {
 			$key = 'oembed';
 		}
 
-		if ( is_array( $value ) ) {
-			$item = $node->addChild( $key );
-			_oembed_create_xml( $value, $item );
+		if (is_array($value)) {
+			$item = $node->addChild($key);
+			_oembed_create_xml($value, $item);
 		} else {
-			$node->addChild( $key, esc_html( $value ) );
+			$node->addChild($key, esc_html($value));
 		}
 	}
 
@@ -715,15 +715,15 @@ 
  * @param string $url    The URL of the content to be embedded.
  * @return string The filtered and sanitized oEmbed result.
  */
-function wp_filter_oembed_result( $result, $data, $url ) {
-	if ( false === $result || ! in_array( $data->type, array( 'rich', 'video' ) ) ) {
+function wp_filter_oembed_result($result, $data, $url) {
+	if (false === $result || ! in_array($data->type, array('rich', 'video'))) {
 		return $result;
 	}
 
 	$wp_oembed = _wp_oembed_get_object();
 
 	// Don't modify the HTML for trusted providers.
-	if ( false !== $wp_oembed->get_provider( $url, array( 'discover' => false ) ) ) {
+	if (false !== $wp_oembed->get_provider($url, array('discover' => false))) {
 		return $result;
 	}
 
@@ -744,32 +744,32 @@ 
 		),
 	);
 
-	$html = wp_kses( $result, $allowed_html );
+	$html = wp_kses($result, $allowed_html);
 
-	preg_match( '|(<blockquote>.*?</blockquote>)?.*(<iframe.*?></iframe>)|ms', $html, $content );
+	preg_match('|(<blockquote>.*?</blockquote>)?.*(<iframe.*?></iframe>)|ms', $html, $content);
 	// We require at least the iframe to exist.
-	if ( empty( $content[2] ) ) {
+	if (empty($content[2])) {
 		return false;
 	}
-	$html = $content[1] . $content[2];
+	$html = $content[1].$content[2];
 
-	if ( ! empty( $content[1] ) ) {
+	if ( ! empty($content[1])) {
 		// We have a blockquote to fall back on. Hide the iframe by default.
-		$html = str_replace( '<iframe', '<iframe style="position: absolute; clip: rect(1px, 1px, 1px, 1px);"', $html );
-		$html = str_replace( '<blockquote', '<blockquote class="wp-embedded-content"', $html );
+		$html = str_replace('<iframe', '<iframe style="position: absolute; clip: rect(1px, 1px, 1px, 1px);"', $html);
+		$html = str_replace('<blockquote', '<blockquote class="wp-embedded-content"', $html);
 	}
 
-	$html = str_replace( '<iframe', '<iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted"', $html );
+	$html = str_replace('<iframe', '<iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted"', $html);
 
-	preg_match( '/ src=[\'"]([^\'"]*)[\'"]/', $html, $results );
+	preg_match('/ src=[\'"]([^\'"]*)[\'"]/', $html, $results);
 
-	if ( ! empty( $results ) ) {
-		$secret = wp_generate_password( 10, false );
+	if ( ! empty($results)) {
+		$secret = wp_generate_password(10, false);
 
-		$url = esc_url( "{$results[1]}#?secret=$secret" );
+		$url = esc_url("{$results[1]}#?secret=$secret");
 
-		$html = str_replace( $results[0], " src=\"$url\" data-secret=\"$secret\"", $html );
-		$html = str_replace( '<blockquote', "<blockquote data-secret=\"$secret\"", $html );
+		$html = str_replace($results[0], " src=\"$url\" data-secret=\"$secret\"", $html);
+		$html = str_replace('<blockquote', "<blockquote data-secret=\"$secret\"", $html);
 	}
 
 	return $html;
@@ -786,17 +786,17 @@ 
  * @param string $more_string Default 'more' string.
  * @return string 'Continue reading' link prepended with an ellipsis.
  */
-function wp_embed_excerpt_more( $more_string ) {
-	if ( ! is_embed() ) {
+function wp_embed_excerpt_more($more_string) {
+	if ( ! is_embed()) {
 		return $more_string;
 	}
 
-	$link = sprintf( '<a href="%1$s" class="wp-embed-more" target="_top">%2$s</a>',
-		esc_url( get_permalink() ),
+	$link = sprintf('<a href="%1$s" class="wp-embed-more" target="_top">%2$s</a>',
+		esc_url(get_permalink()),
 		/* translators: %s: Name of current post */
-		sprintf( __( 'Continue reading %s' ), '<span class="screen-reader-text">' . get_the_title() . '</span>' )
+		sprintf(__('Continue reading %s'), '<span class="screen-reader-text">'.get_the_title().'</span>')
 	);
-	return ' &hellip; ' . $link;
+	return ' &hellip; '.$link;
 }
 
 /**
@@ -816,7 +816,7 @@ 
 	 *
 	 * @param string $output The current post excerpt.
 	 */
-	echo apply_filters( 'the_excerpt_embed', $output );
+	echo apply_filters('the_excerpt_embed', $output);
 }
 
 /**
@@ -829,9 +829,9 @@ 
  * @param string $content The current post excerpt.
  * @return string The modified post excerpt.
  */
-function wp_embed_excerpt_attachment( $content ) {
-	if ( is_attachment() ) {
-		return prepend_attachment( '' );
+function wp_embed_excerpt_attachment($content) {
+	if (is_attachment()) {
+		return prepend_attachment('');
 	}
 
 	return $content;
@@ -848,14 +848,14 @@ 
  * @since 4.4.0
  */
 function enqueue_embed_scripts() {
-	wp_enqueue_style( 'wp-embed-template-ie' );
+	wp_enqueue_style('wp-embed-template-ie');
 
 	/**
 	 * Fires when scripts and styles are enqueued for the embed iframe.
 	 *
 	 * @since 4.4.0
 	 */
-	do_action( 'enqueue_embed_scripts' );
+	do_action('enqueue_embed_scripts');
 }
 
 /**
@@ -867,8 +867,8 @@ 
 	?>
 	<style type="text/css">
 	<?php
-		if ( SCRIPT_DEBUG ) {
-			readfile( ABSPATH . WPINC . "/css/wp-embed-template.css" );
+		if (SCRIPT_DEBUG) {
+			readfile(ABSPATH.WPINC."/css/wp-embed-template.css");
 		} else {
 			/*
 			 * If you're looking at a src version of this file, you'll see an "include"
@@ -898,8 +898,8 @@ 
 	?>
 	<script type="text/javascript">
 	<?php
-		if ( SCRIPT_DEBUG ) {
-			readfile( ABSPATH . WPINC . "/js/wp-embed-template.js" );
+		if (SCRIPT_DEBUG) {
+			readfile(ABSPATH.WPINC."/js/wp-embed-template.js");
 		} else {
 			/*
 			 * If you're looking at a src version of this file, you'll see an "include"
@@ -929,8 +929,8 @@ 
  * @param string $content The content to filter.
  * @return string The filtered content.
  */
-function _oembed_filter_feed_content( $content ) {
-	return str_replace( '<iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted" style="position: absolute; clip: rect(1px, 1px, 1px, 1px);"', '<iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted"', $content );
+function _oembed_filter_feed_content($content) {
+	return str_replace('<iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted" style="position: absolute; clip: rect(1px, 1px, 1px, 1px);"', '<iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted"', $content);
 }
 
 /**
@@ -939,7 +939,7 @@ 
  * @since 4.4.0
  */
 function print_embed_comments_button() {
-	if ( is_404() || ! ( get_comments_number() || comments_open() ) ) {
+	if (is_404() || ! (get_comments_number() || comments_open())) {
 		return;
 	}
 	?>
@@ -953,7 +953,7 @@ 
 					'%s <span class="screen-reader-text">Comments</span>',
 					get_comments_number()
 				),
-				number_format_i18n( get_comments_number() )
+				number_format_i18n(get_comments_number())
 			);
 			?>
 		</a>
@@ -967,12 +967,12 @@ 
  * @since 4.4.0
  */
 function print_embed_sharing_button() {
-	if ( is_404() ) {
+	if (is_404()) {
 		return;
 	}
 	?>
 	<div class="wp-embed-share">
-		<button type="button" class="wp-embed-share-dialog-open" aria-label="<?php esc_attr_e( 'Open sharing dialog' ); ?>">
+		<button type="button" class="wp-embed-share-dialog-open" aria-label="<?php esc_attr_e('Open sharing dialog'); ?>">
 			<span class="dashicons dashicons-share"></span>
 		</button>
 	</div>
@@ -985,38 +985,38 @@ 
  * @since 4.4.0
  */
 function print_embed_sharing_dialog() {
-	if ( is_404() ) {
+	if (is_404()) {
 		return;
 	}
 	?>
-	<div class="wp-embed-share-dialog hidden" role="dialog" aria-label="<?php esc_attr_e( 'Sharing options' ); ?>">
+	<div class="wp-embed-share-dialog hidden" role="dialog" aria-label="<?php esc_attr_e('Sharing options'); ?>">
 		<div class="wp-embed-share-dialog-content">
 			<div class="wp-embed-share-dialog-text">
 				<ul class="wp-embed-share-tabs" role="tablist">
 					<li class="wp-embed-share-tab-button wp-embed-share-tab-button-wordpress" role="presentation">
-						<button type="button" role="tab" aria-controls="wp-embed-share-tab-wordpress" aria-selected="true" tabindex="0"><?php esc_html_e( 'WordPress Embed' ); ?></button>
+						<button type="button" role="tab" aria-controls="wp-embed-share-tab-wordpress" aria-selected="true" tabindex="0"><?php esc_html_e('WordPress Embed'); ?></button>
 					</li>
 					<li class="wp-embed-share-tab-button wp-embed-share-tab-button-html" role="presentation">
-						<button type="button" role="tab" aria-controls="wp-embed-share-tab-html" aria-selected="false" tabindex="-1"><?php esc_html_e( 'HTML Embed' ); ?></button>
+						<button type="button" role="tab" aria-controls="wp-embed-share-tab-html" aria-selected="false" tabindex="-1"><?php esc_html_e('HTML Embed'); ?></button>
 					</li>
 				</ul>
 				<div id="wp-embed-share-tab-wordpress" class="wp-embed-share-tab" role="tabpanel" aria-hidden="false">
 					<input type="text" value="<?php the_permalink(); ?>" class="wp-embed-share-input" aria-describedby="wp-embed-share-description-wordpress" tabindex="0" readonly/>
 
 					<p class="wp-embed-share-description" id="wp-embed-share-description-wordpress">
-						<?php _e( 'Copy and paste this URL into your WordPress site to embed' ); ?>
+						<?php _e('Copy and paste this URL into your WordPress site to embed'); ?>
 					</p>
 				</div>
 				<div id="wp-embed-share-tab-html" class="wp-embed-share-tab" role="tabpanel" aria-hidden="true">
-					<textarea class="wp-embed-share-input" aria-describedby="wp-embed-share-description-html" tabindex="0" readonly><?php echo esc_textarea( get_post_embed_html( 600, 400 ) ); ?></textarea>
+					<textarea class="wp-embed-share-input" aria-describedby="wp-embed-share-description-html" tabindex="0" readonly><?php echo esc_textarea(get_post_embed_html(600, 400)); ?></textarea>
 
 					<p class="wp-embed-share-description" id="wp-embed-share-description-html">
-						<?php _e( 'Copy and paste this code into your site to embed' ); ?>
+						<?php _e('Copy and paste this code into your site to embed'); ?>
 					</p>
 				</div>
 			</div>
 
-			<button type="button" class="wp-embed-share-dialog-close" aria-label="<?php esc_attr_e( 'Close sharing dialog' ); ?>">
+			<button type="button" class="wp-embed-share-dialog-close" aria-label="<?php esc_attr_e('Close sharing dialog'); ?>">
 				<span class="dashicons dashicons-no"></span>
 			</button>
 		</div>
@@ -1032,13 +1032,13 @@ 
 function the_embed_site_title() {
 	$site_title = sprintf(
 		'<a href="%s" target="_top"><img src="%s" srcset="%s 2x" width="32" height="32" alt="" class="wp-embed-site-icon"/><span>%s</span></a>',
-		esc_url( home_url() ),
-		esc_url( get_site_icon_url( 32, admin_url( 'images/w-logo-blue.png' ) ) ),
-		esc_url( get_site_icon_url( 64, admin_url( 'images/w-logo-blue.png' ) ) ),
-		esc_html( get_bloginfo( 'name' ) )
+		esc_url(home_url()),
+		esc_url(get_site_icon_url(32, admin_url('images/w-logo-blue.png'))),
+		esc_url(get_site_icon_url(64, admin_url('images/w-logo-blue.png'))),
+		esc_html(get_bloginfo('name'))
 	);
 
-	$site_title = '<div class="wp-embed-site-title">' . $site_title . '</div>';
+	$site_title = '<div class="wp-embed-site-title">'.$site_title.'</div>';
 
 	/**
 	 * Filters the site title HTML in the embed footer.
@@ -1047,7 +1047,7 @@ 
 	 *
 	 * @param string $site_title The site title HTML.
 	 */
-	echo apply_filters( 'embed_site_title_html', $site_title );
+	echo apply_filters('embed_site_title_html', $site_title);
 }
 
 /**
@@ -1064,22 +1064,22 @@ 
  * @return null|string The UNSANITIZED (and potentially unsafe) HTML that should be used to embed.
  *                     Null if the URL does not belong to the current site.
  */
-function wp_filter_pre_oembed_result( $result, $url, $args ) {
-	$post_id = url_to_postid( $url );
+function wp_filter_pre_oembed_result($result, $url, $args) {
+	$post_id = url_to_postid($url);
 
 	/** This filter is documented in wp-includes/class-wp-oembed-controller.php */
-	$post_id = apply_filters( 'oembed_request_post_id', $post_id, $url );
+	$post_id = apply_filters('oembed_request_post_id', $post_id, $url);
 
-	if ( ! $post_id ) {
+	if ( ! $post_id) {
 		return $result;
 	}
 
-	$width = isset( $args['width'] ) ? $args['width'] : 0;
+	$width = isset($args['width']) ? $args['width'] : 0;
 
-	$data = get_oembed_response_data( $post_id, $width );
-	$data = _wp_oembed_get_object()->data2html( (object) $data, $url );
+	$data = get_oembed_response_data($post_id, $width);
+	$data = _wp_oembed_get_object()->data2html((object) $data, $url);
 
-	if ( ! $data ) {
+	if ( ! $data) {
 		return $result;
 	}
 

src/wp-includes/class-wp-http-ixr-client.php

Spacing +19 added lines, -19 removed lines

@@ -20,21 +20,21 @@ 
 	 * @param int $timeout
 	 */
 	public function __construct($server, $path = false, $port = false, $timeout = 15) {
-		if ( ! $path ) {
+		if ( ! $path) {
 			// Assume we have been given a URL instead
 			$bits = parse_url($server);
 			$this->scheme = $bits['scheme'];
 			$this->server = $bits['host'];
 			$this->port = isset($bits['port']) ? $bits['port'] : $port;
-			$this->path = !empty($bits['path']) ? $bits['path'] : '/';
+			$this->path = ! empty($bits['path']) ? $bits['path'] : '/';
 
 			// Make absolutely sure we have a path
-			if ( ! $this->path ) {
+			if ( ! $this->path) {
 				$this->path = '/';
 			}
 
-			if ( ! empty( $bits['query'] ) ) {
-				$this->path .= '?' . $bits['query'];
+			if ( ! empty($bits['query'])) {
+				$this->path .= '?'.$bits['query'];
 			}
 		} else {
 			$this->scheme = 'http';
@@ -56,7 +56,7 @@ 
 		$xml = $request->getXml();
 
 		$port = $this->port ? ":$this->port" : '';
-		$url = $this->scheme . '://' . $this->server . $port . $this->path;
+		$url = $this->scheme.'://'.$this->server.$port.$this->path;
 		$args = array(
 			'headers'    => array('Content-Type' => 'text/xml'),
 			'user-agent' => $this->useragent,
@@ -64,7 +64,7 @@ 
 		);
 
 		// Merge Custom headers ala #8145
-		foreach ( $this->headers as $header => $value ) {
+		foreach ($this->headers as $header => $value) {
 			$args['headers'][$header] = $value;
 		}
 
@@ -75,45 +75,45 @@ 
 		 *
 		 * @param array $headers Array of headers to be sent.
 		 */
-		$args['headers'] = apply_filters( 'wp_http_ixr_client_headers', $args['headers'] );
+		$args['headers'] = apply_filters('wp_http_ixr_client_headers', $args['headers']);
 
-		if ( $this->timeout !== false ) {
+		if ($this->timeout !== false) {
 			$args['timeout'] = $this->timeout;
 		}
 
 		// Now send the request
-		if ( $this->debug ) {
-			echo '<pre class="ixr_request">' . htmlspecialchars($xml) . "\n</pre>\n\n";
+		if ($this->debug) {
+			echo '<pre class="ixr_request">'.htmlspecialchars($xml)."\n</pre>\n\n";
 		}
 
 		$response = wp_remote_post($url, $args);
 
-		if ( is_wp_error($response) ) {
+		if (is_wp_error($response)) {
 			$errno    = $response->get_error_code();
 			$errorstr = $response->get_error_message();
 			$this->error = new IXR_Error(-32300, "transport error: $errno $errorstr");
 			return false;
 		}
 
-		if ( 200 != wp_remote_retrieve_response_code( $response ) ) {
-			$this->error = new IXR_Error(-32301, 'transport error - HTTP status code was not 200 (' . wp_remote_retrieve_response_code( $response ) . ')');
+		if (200 != wp_remote_retrieve_response_code($response)) {
+			$this->error = new IXR_Error(-32301, 'transport error - HTTP status code was not 200 ('.wp_remote_retrieve_response_code($response).')');
 			return false;
 		}
 
-		if ( $this->debug ) {
-			echo '<pre class="ixr_response">' . htmlspecialchars( wp_remote_retrieve_body( $response ) ) . "\n</pre>\n\n";
+		if ($this->debug) {
+			echo '<pre class="ixr_response">'.htmlspecialchars(wp_remote_retrieve_body($response))."\n</pre>\n\n";
 		}
 
 		// Now parse what we've got back
-		$this->message = new IXR_Message( wp_remote_retrieve_body( $response ) );
-		if ( ! $this->message->parse() ) {
+		$this->message = new IXR_Message(wp_remote_retrieve_body($response));
+		if ( ! $this->message->parse()) {
 			// XML error
 			$this->error = new IXR_Error(-32700, 'parse error. not well formed');
 			return false;
 		}
 
 		// Is the message a fault?
-		if ( $this->message->messageType == 'fault' ) {
+		if ($this->message->messageType == 'fault') {
 			$this->error = new IXR_Error($this->message->faultCode, $this->message->faultString);
 			return false;
 		}

src/wp-includes/Text/Diff/Engine/string.php

Indentation +222 added lines, -222 removed lines

@@ -22,227 +22,227 @@
  */
 class Text_Diff_Engine_string {
 
-    /**
-     * Parses a unified or context diff.
-     *
-     * First param contains the whole diff and the second can be used to force
-     * a specific diff type. If the second parameter is 'autodetect', the
-     * diff will be examined to find out which type of diff this is.
-     *
-     * @param string $diff  The diff content.
-     * @param string $mode  The diff mode of the content in $diff. One of
-     *                      'context', 'unified', or 'autodetect'.
-     *
-     * @return array  List of all diff operations.
-     */
-    function diff($diff, $mode = 'autodetect')
-    {
-        // Detect line breaks.
-        $lnbr = "\n";
-        if (strpos($diff, "\r\n") !== false) {
-            $lnbr = "\r\n";
-        } elseif (strpos($diff, "\r") !== false) {
-            $lnbr = "\r";
-        }
-
-        // Make sure we have a line break at the EOF.
-        if (substr($diff, -strlen($lnbr)) != $lnbr) {
-            $diff .= $lnbr;
-        }
-
-        if ($mode != 'autodetect' && $mode != 'context' && $mode != 'unified') {
-            return PEAR::raiseError('Type of diff is unsupported');
-        }
-
-        if ($mode == 'autodetect') {
-            $context = strpos($diff, '***');
-            $unified = strpos($diff, '---');
-            if ($context === $unified) {
-                return PEAR::raiseError('Type of diff could not be detected');
-            } elseif ($context === false || $unified === false) {
-                $mode = $context !== false ? 'context' : 'unified';
-            } else {
-                $mode = $context < $unified ? 'context' : 'unified';
-            }
-        }
-
-        // Split by new line and remove the diff header, if there is one.
-        $diff = explode($lnbr, $diff);
-        if (($mode == 'context' && strpos($diff[0], '***') === 0) ||
-            ($mode == 'unified' && strpos($diff[0], '---') === 0)) {
-            array_shift($diff);
-            array_shift($diff);
-        }
-
-        if ($mode == 'context') {
-            return $this->parseContextDiff($diff);
-        } else {
-            return $this->parseUnifiedDiff($diff);
-        }
-    }
-
-    /**
-     * Parses an array containing the unified diff.
-     *
-     * @param array $diff  Array of lines.
-     *
-     * @return array  List of all diff operations.
-     */
-    function parseUnifiedDiff($diff)
-    {
-        $edits = array();
-        $end = count($diff) - 1;
-        for ($i = 0; $i < $end;) {
-            $diff1 = array();
-            switch (substr($diff[$i], 0, 1)) {
-            case ' ':
-                do {
-                    $diff1[] = substr($diff[$i], 1);
-                } while (++$i < $end && substr($diff[$i], 0, 1) == ' ');
-                $edits[] = new Text_Diff_Op_copy($diff1);
-                break;
-
-            case '+':
-                // get all new lines
-                do {
-                    $diff1[] = substr($diff[$i], 1);
-                } while (++$i < $end && substr($diff[$i], 0, 1) == '+');
-                $edits[] = new Text_Diff_Op_add($diff1);
-                break;
-
-            case '-':
-                // get changed or removed lines
-                $diff2 = array();
-                do {
-                    $diff1[] = substr($diff[$i], 1);
-                } while (++$i < $end && substr($diff[$i], 0, 1) == '-');
-
-                while ($i < $end && substr($diff[$i], 0, 1) == '+') {
-                    $diff2[] = substr($diff[$i++], 1);
-                }
-                if (count($diff2) == 0) {
-                    $edits[] = new Text_Diff_Op_delete($diff1);
-                } else {
-                    $edits[] = new Text_Diff_Op_change($diff1, $diff2);
-                }
-                break;
-
-            default:
-                $i++;
-                break;
-            }
-        }
-
-        return $edits;
-    }
-
-    /**
-     * Parses an array containing the context diff.
-     *
-     * @param array $diff  Array of lines.
-     *
-     * @return array  List of all diff operations.
-     */
-    function parseContextDiff(&$diff)
-    {
-        $edits = array();
-        $i = $max_i = $j = $max_j = 0;
-        $end = count($diff) - 1;
-        while ($i < $end && $j < $end) {
-            while ($i >= $max_i && $j >= $max_j) {
-                // Find the boundaries of the diff output of the two files
-                for ($i = $j;
-                     $i < $end && substr($diff[$i], 0, 3) == '***';
-                     $i++);
-                for ($max_i = $i;
-                     $max_i < $end && substr($diff[$max_i], 0, 3) != '---';
-                     $max_i++);
-                for ($j = $max_i;
-                     $j < $end && substr($diff[$j], 0, 3) == '---';
-                     $j++);
-                for ($max_j = $j;
-                     $max_j < $end && substr($diff[$max_j], 0, 3) != '***';
-                     $max_j++);
-            }
-
-            // find what hasn't been changed
-            $array = array();
-            while ($i < $max_i &&
-                   $j < $max_j &&
-                   strcmp($diff[$i], $diff[$j]) == 0) {
-                $array[] = substr($diff[$i], 2);
-                $i++;
-                $j++;
-            }
-
-            while ($i < $max_i && ($max_j-$j) <= 1) {
-                if ($diff[$i] != '' && substr($diff[$i], 0, 1) != ' ') {
-                    break;
-                }
-                $array[] = substr($diff[$i++], 2);
-            }
-
-            while ($j < $max_j && ($max_i-$i) <= 1) {
-                if ($diff[$j] != '' && substr($diff[$j], 0, 1) != ' ') {
-                    break;
-                }
-                $array[] = substr($diff[$j++], 2);
-            }
-            if (count($array) > 0) {
-                $edits[] = new Text_Diff_Op_copy($array);
-            }
-
-            if ($i < $max_i) {
-                $diff1 = array();
-                switch (substr($diff[$i], 0, 1)) {
-                case '!':
-                    $diff2 = array();
-                    do {
-                        $diff1[] = substr($diff[$i], 2);
-                        if ($j < $max_j && substr($diff[$j], 0, 1) == '!') {
-                            $diff2[] = substr($diff[$j++], 2);
-                        }
-                    } while (++$i < $max_i && substr($diff[$i], 0, 1) == '!');
-                    $edits[] = new Text_Diff_Op_change($diff1, $diff2);
-                    break;
-
-                case '+':
-                    do {
-                        $diff1[] = substr($diff[$i], 2);
-                    } while (++$i < $max_i && substr($diff[$i], 0, 1) == '+');
-                    $edits[] = new Text_Diff_Op_add($diff1);
-                    break;
-
-                case '-':
-                    do {
-                        $diff1[] = substr($diff[$i], 2);
-                    } while (++$i < $max_i && substr($diff[$i], 0, 1) == '-');
-                    $edits[] = new Text_Diff_Op_delete($diff1);
-                    break;
-                }
-            }
-
-            if ($j < $max_j) {
-                $diff2 = array();
-                switch (substr($diff[$j], 0, 1)) {
-                case '+':
-                    do {
-                        $diff2[] = substr($diff[$j++], 2);
-                    } while ($j < $max_j && substr($diff[$j], 0, 1) == '+');
-                    $edits[] = new Text_Diff_Op_add($diff2);
-                    break;
-
-                case '-':
-                    do {
-                        $diff2[] = substr($diff[$j++], 2);
-                    } while ($j < $max_j && substr($diff[$j], 0, 1) == '-');
-                    $edits[] = new Text_Diff_Op_delete($diff2);
-                    break;
-                }
-            }
-        }
-
-        return $edits;
-    }
+	/**
+	 * Parses a unified or context diff.
+	 *
+	 * First param contains the whole diff and the second can be used to force
+	 * a specific diff type. If the second parameter is 'autodetect', the
+	 * diff will be examined to find out which type of diff this is.
+	 *
+	 * @param string $diff  The diff content.
+	 * @param string $mode  The diff mode of the content in $diff. One of
+	 *                      'context', 'unified', or 'autodetect'.
+	 *
+	 * @return array  List of all diff operations.
+	 */
+	function diff($diff, $mode = 'autodetect')
+	{
+		// Detect line breaks.
+		$lnbr = "\n";
+		if (strpos($diff, "\r\n") !== false) {
+			$lnbr = "\r\n";
+		} elseif (strpos($diff, "\r") !== false) {
+			$lnbr = "\r";
+		}
+
+		// Make sure we have a line break at the EOF.
+		if (substr($diff, -strlen($lnbr)) != $lnbr) {
+			$diff .= $lnbr;
+		}
+
+		if ($mode != 'autodetect' && $mode != 'context' && $mode != 'unified') {
+			return PEAR::raiseError('Type of diff is unsupported');
+		}
+
+		if ($mode == 'autodetect') {
+			$context = strpos($diff, '***');
+			$unified = strpos($diff, '---');
+			if ($context === $unified) {
+				return PEAR::raiseError('Type of diff could not be detected');
+			} elseif ($context === false || $unified === false) {
+				$mode = $context !== false ? 'context' : 'unified';
+			} else {
+				$mode = $context < $unified ? 'context' : 'unified';
+			}
+		}
+
+		// Split by new line and remove the diff header, if there is one.
+		$diff = explode($lnbr, $diff);
+		if (($mode == 'context' && strpos($diff[0], '***') === 0) ||
+			($mode == 'unified' && strpos($diff[0], '---') === 0)) {
+			array_shift($diff);
+			array_shift($diff);
+		}
+
+		if ($mode == 'context') {
+			return $this->parseContextDiff($diff);
+		} else {
+			return $this->parseUnifiedDiff($diff);
+		}
+	}
+
+	/**
+	 * Parses an array containing the unified diff.
+	 *
+	 * @param array $diff  Array of lines.
+	 *
+	 * @return array  List of all diff operations.
+	 */
+	function parseUnifiedDiff($diff)
+	{
+		$edits = array();
+		$end = count($diff) - 1;
+		for ($i = 0; $i < $end;) {
+			$diff1 = array();
+			switch (substr($diff[$i], 0, 1)) {
+			case ' ':
+				do {
+					$diff1[] = substr($diff[$i], 1);
+				} while (++$i < $end && substr($diff[$i], 0, 1) == ' ');
+				$edits[] = new Text_Diff_Op_copy($diff1);
+				break;
+
+			case '+':
+				// get all new lines
+				do {
+					$diff1[] = substr($diff[$i], 1);
+				} while (++$i < $end && substr($diff[$i], 0, 1) == '+');
+				$edits[] = new Text_Diff_Op_add($diff1);
+				break;
+
+			case '-':
+				// get changed or removed lines
+				$diff2 = array();
+				do {
+					$diff1[] = substr($diff[$i], 1);
+				} while (++$i < $end && substr($diff[$i], 0, 1) == '-');
+
+				while ($i < $end && substr($diff[$i], 0, 1) == '+') {
+					$diff2[] = substr($diff[$i++], 1);
+				}
+				if (count($diff2) == 0) {
+					$edits[] = new Text_Diff_Op_delete($diff1);
+				} else {
+					$edits[] = new Text_Diff_Op_change($diff1, $diff2);
+				}
+				break;
+
+			default:
+				$i++;
+				break;
+			}
+		}
+
+		return $edits;
+	}
+
+	/**
+	 * Parses an array containing the context diff.
+	 *
+	 * @param array $diff  Array of lines.
+	 *
+	 * @return array  List of all diff operations.
+	 */
+	function parseContextDiff(&$diff)
+	{
+		$edits = array();
+		$i = $max_i = $j = $max_j = 0;
+		$end = count($diff) - 1;
+		while ($i < $end && $j < $end) {
+			while ($i >= $max_i && $j >= $max_j) {
+				// Find the boundaries of the diff output of the two files
+				for ($i = $j;
+					 $i < $end && substr($diff[$i], 0, 3) == '***';
+					 $i++);
+				for ($max_i = $i;
+					 $max_i < $end && substr($diff[$max_i], 0, 3) != '---';
+					 $max_i++);
+				for ($j = $max_i;
+					 $j < $end && substr($diff[$j], 0, 3) == '---';
+					 $j++);
+				for ($max_j = $j;
+					 $max_j < $end && substr($diff[$max_j], 0, 3) != '***';
+					 $max_j++);
+			}
+
+			// find what hasn't been changed
+			$array = array();
+			while ($i < $max_i &&
+				   $j < $max_j &&
+				   strcmp($diff[$i], $diff[$j]) == 0) {
+				$array[] = substr($diff[$i], 2);
+				$i++;
+				$j++;
+			}
+
+			while ($i < $max_i && ($max_j-$j) <= 1) {
+				if ($diff[$i] != '' && substr($diff[$i], 0, 1) != ' ') {
+					break;
+				}
+				$array[] = substr($diff[$i++], 2);
+			}
+
+			while ($j < $max_j && ($max_i-$i) <= 1) {
+				if ($diff[$j] != '' && substr($diff[$j], 0, 1) != ' ') {
+					break;
+				}
+				$array[] = substr($diff[$j++], 2);
+			}
+			if (count($array) > 0) {
+				$edits[] = new Text_Diff_Op_copy($array);
+			}
+
+			if ($i < $max_i) {
+				$diff1 = array();
+				switch (substr($diff[$i], 0, 1)) {
+				case '!':
+					$diff2 = array();
+					do {
+						$diff1[] = substr($diff[$i], 2);
+						if ($j < $max_j && substr($diff[$j], 0, 1) == '!') {
+							$diff2[] = substr($diff[$j++], 2);
+						}
+					} while (++$i < $max_i && substr($diff[$i], 0, 1) == '!');
+					$edits[] = new Text_Diff_Op_change($diff1, $diff2);
+					break;
+
+				case '+':
+					do {
+						$diff1[] = substr($diff[$i], 2);
+					} while (++$i < $max_i && substr($diff[$i], 0, 1) == '+');
+					$edits[] = new Text_Diff_Op_add($diff1);
+					break;
+
+				case '-':
+					do {
+						$diff1[] = substr($diff[$i], 2);
+					} while (++$i < $max_i && substr($diff[$i], 0, 1) == '-');
+					$edits[] = new Text_Diff_Op_delete($diff1);
+					break;
+				}
+			}
+
+			if ($j < $max_j) {
+				$diff2 = array();
+				switch (substr($diff[$j], 0, 1)) {
+				case '+':
+					do {
+						$diff2[] = substr($diff[$j++], 2);
+					} while ($j < $max_j && substr($diff[$j], 0, 1) == '+');
+					$edits[] = new Text_Diff_Op_add($diff2);
+					break;
+
+				case '-':
+					do {
+						$diff2[] = substr($diff[$j++], 2);
+					} while ($j < $max_j && substr($diff[$j], 0, 1) == '-');
+					$edits[] = new Text_Diff_Op_delete($diff2);
+					break;
+				}
+			}
+		}
+
+		return $edits;
+	}
 
 }

Switch Indentation +72 added lines, -72 removed lines

@@ -95,41 +95,41 @@ 
         for ($i = 0; $i < $end;) {
             $diff1 = array();
             switch (substr($diff[$i], 0, 1)) {
-            case ' ':
-                do {
-                    $diff1[] = substr($diff[$i], 1);
-                } while (++$i < $end && substr($diff[$i], 0, 1) == ' ');
-                $edits[] = new Text_Diff_Op_copy($diff1);
-                break;
-
-            case '+':
-                // get all new lines
-                do {
-                    $diff1[] = substr($diff[$i], 1);
-                } while (++$i < $end && substr($diff[$i], 0, 1) == '+');
-                $edits[] = new Text_Diff_Op_add($diff1);
-                break;
-
-            case '-':
-                // get changed or removed lines
-                $diff2 = array();
-                do {
-                    $diff1[] = substr($diff[$i], 1);
-                } while (++$i < $end && substr($diff[$i], 0, 1) == '-');
-
-                while ($i < $end && substr($diff[$i], 0, 1) == '+') {
-                    $diff2[] = substr($diff[$i++], 1);
-                }
-                if (count($diff2) == 0) {
-                    $edits[] = new Text_Diff_Op_delete($diff1);
-                } else {
-                    $edits[] = new Text_Diff_Op_change($diff1, $diff2);
-                }
-                break;
-
-            default:
-                $i++;
-                break;
+            	case ' ':
+                	do {
+                    	$diff1[] = substr($diff[$i], 1);
+                	} while (++$i < $end && substr($diff[$i], 0, 1) == ' ');
+                	$edits[] = new Text_Diff_Op_copy($diff1);
+                	break;
+
+            	case '+':
+                	// get all new lines
+                	do {
+                    	$diff1[] = substr($diff[$i], 1);
+                	} while (++$i < $end && substr($diff[$i], 0, 1) == '+');
+                	$edits[] = new Text_Diff_Op_add($diff1);
+                	break;
+
+            	case '-':
+                	// get changed or removed lines
+                	$diff2 = array();
+                	do {
+                    	$diff1[] = substr($diff[$i], 1);
+                	} while (++$i < $end && substr($diff[$i], 0, 1) == '-');
+
+                	while ($i < $end && substr($diff[$i], 0, 1) == '+') {
+                    	$diff2[] = substr($diff[$i++], 1);
+                	}
+                	if (count($diff2) == 0) {
+                    	$edits[] = new Text_Diff_Op_delete($diff1);
+                	} else {
+                    	$edits[] = new Text_Diff_Op_change($diff1, $diff2);
+                	}
+                	break;
+
+            	default:
+                	$i++;
+                	break;
             }
         }
 
@@ -195,49 +195,49 @@ 
             if ($i < $max_i) {
                 $diff1 = array();
                 switch (substr($diff[$i], 0, 1)) {
-                case '!':
-                    $diff2 = array();
-                    do {
-                        $diff1[] = substr($diff[$i], 2);
-                        if ($j < $max_j && substr($diff[$j], 0, 1) == '!') {
-                            $diff2[] = substr($diff[$j++], 2);
-                        }
-                    } while (++$i < $max_i && substr($diff[$i], 0, 1) == '!');
-                    $edits[] = new Text_Diff_Op_change($diff1, $diff2);
-                    break;
-
-                case '+':
-                    do {
-                        $diff1[] = substr($diff[$i], 2);
-                    } while (++$i < $max_i && substr($diff[$i], 0, 1) == '+');
-                    $edits[] = new Text_Diff_Op_add($diff1);
-                    break;
-
-                case '-':
-                    do {
-                        $diff1[] = substr($diff[$i], 2);
-                    } while (++$i < $max_i && substr($diff[$i], 0, 1) == '-');
-                    $edits[] = new Text_Diff_Op_delete($diff1);
-                    break;
+                	case '!':
+                    	$diff2 = array();
+                    	do {
+                        	$diff1[] = substr($diff[$i], 2);
+                        	if ($j < $max_j && substr($diff[$j], 0, 1) == '!') {
+                            	$diff2[] = substr($diff[$j++], 2);
+                        	}
+                    	} while (++$i < $max_i && substr($diff[$i], 0, 1) == '!');
+                    	$edits[] = new Text_Diff_Op_change($diff1, $diff2);
+                    	break;
+
+                	case '+':
+                    	do {
+                        	$diff1[] = substr($diff[$i], 2);
+                    	} while (++$i < $max_i && substr($diff[$i], 0, 1) == '+');
+                    	$edits[] = new Text_Diff_Op_add($diff1);
+                    	break;
+
+                	case '-':
+                    	do {
+                        	$diff1[] = substr($diff[$i], 2);
+                    	} while (++$i < $max_i && substr($diff[$i], 0, 1) == '-');
+                    	$edits[] = new Text_Diff_Op_delete($diff1);
+                    	break;
                 }
             }
 
             if ($j < $max_j) {
                 $diff2 = array();
                 switch (substr($diff[$j], 0, 1)) {
-                case '+':
-                    do {
-                        $diff2[] = substr($diff[$j++], 2);
-                    } while ($j < $max_j && substr($diff[$j], 0, 1) == '+');
-                    $edits[] = new Text_Diff_Op_add($diff2);
-                    break;
-
-                case '-':
-                    do {
-                        $diff2[] = substr($diff[$j++], 2);
-                    } while ($j < $max_j && substr($diff[$j], 0, 1) == '-');
-                    $edits[] = new Text_Diff_Op_delete($diff2);
-                    break;
+                	case '+':
+                    	do {
+                        	$diff2[] = substr($diff[$j++], 2);
+                    	} while ($j < $max_j && substr($diff[$j], 0, 1) == '+');
+                    	$edits[] = new Text_Diff_Op_add($diff2);
+                    	break;
+
+                	case '-':
+                    	do {
+                        	$diff2[] = substr($diff[$j++], 2);
+                    	} while ($j < $max_j && substr($diff[$j], 0, 1) == '-');
+                    	$edits[] = new Text_Diff_Op_delete($diff2);
+                    	break;
                 }
             }
         }

Spacing +2 added lines, -2 removed lines

@@ -175,14 +175,14 @@
                 $j++;
             }
 
-            while ($i < $max_i && ($max_j-$j) <= 1) {
+            while ($i < $max_i && ($max_j - $j) <= 1) {
                 if ($diff[$i] != '' && substr($diff[$i], 0, 1) != ' ') {
                     break;
                 }
                 $array[] = substr($diff[$i++], 2);
             }
 
-            while ($j < $max_j && ($max_i-$i) <= 1) {
+            while ($j < $max_j && ($max_i - $i) <= 1) {
                 if ($diff[$j] != '' && substr($diff[$j], 0, 1) != ' ') {
                     break;
                 }

src/wp-includes/random_compat/byte_safe_strings.php

Spacing +10 added lines, -10 removed lines

@@ -26,7 +26,7 @@ 
  * SOFTWARE.
  */
 
-if (!function_exists('RandomCompat_strlen')) {
+if ( ! function_exists('RandomCompat_strlen')) {
     if (
         defined('MB_OVERLOAD_STRING') &&
         ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING
@@ -45,7 +45,7 @@ 
          */
         function RandomCompat_strlen($binary_string)
         {
-            if (!is_string($binary_string)) {
+            if ( ! is_string($binary_string)) {
                 throw new TypeError(
                     'RandomCompat_strlen() expects a string'
                 );
@@ -68,7 +68,7 @@ 
          */
         function RandomCompat_strlen($binary_string)
         {
-            if (!is_string($binary_string)) {
+            if ( ! is_string($binary_string)) {
                 throw new TypeError(
                     'RandomCompat_strlen() expects a string'
                 );
@@ -78,7 +78,7 @@ 
     }
 }
 
-if (!function_exists('RandomCompat_substr')) {
+if ( ! function_exists('RandomCompat_substr')) {
 
     if (
         defined('MB_OVERLOAD_STRING')
@@ -101,13 +101,13 @@ 
          */
         function RandomCompat_substr($binary_string, $start, $length = null)
         {
-            if (!is_string($binary_string)) {
+            if ( ! is_string($binary_string)) {
                 throw new TypeError(
                     'RandomCompat_substr(): First argument should be a string'
                 );
             }
 
-            if (!is_int($start)) {
+            if ( ! is_int($start)) {
                 throw new TypeError(
                     'RandomCompat_substr(): Second argument should be an integer'
                 );
@@ -119,7 +119,7 @@ 
                  * PHP 5.3, so we have to find the length ourselves.
                  */
                 $length = RandomCompat_strlen($length) - $start;
-            } elseif (!is_int($length)) {
+            } elseif ( ! is_int($length)) {
                 throw new TypeError(
                     'RandomCompat_substr(): Third argument should be an integer, or omitted'
                 );
@@ -145,20 +145,20 @@ 
          */
         function RandomCompat_substr($binary_string, $start, $length = null)
         {
-            if (!is_string($binary_string)) {
+            if ( ! is_string($binary_string)) {
                 throw new TypeError(
                     'RandomCompat_substr(): First argument should be a string'
                 );
             }
 
-            if (!is_int($start)) {
+            if ( ! is_int($start)) {
                 throw new TypeError(
                     'RandomCompat_substr(): Second argument should be an integer'
                 );
             }
 
             if ($length !== null) {
-                if (!is_int($length)) {
+                if ( ! is_int($length)) {
                     throw new TypeError(
                         'RandomCompat_substr(): Third argument should be an integer, or omitted'
                     );

Indentation +128 added lines, -128 removed lines

@@ -27,147 +27,147 @@
  */
 
 if (!function_exists('RandomCompat_strlen')) {
-    if (
-        defined('MB_OVERLOAD_STRING') &&
-        ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING
-    ) {
-        /**
-         * strlen() implementation that isn't brittle to mbstring.func_overload
-         *
-         * This version uses mb_strlen() in '8bit' mode to treat strings as raw
-         * binary rather than UTF-8, ISO-8859-1, etc
-         *
-         * @param string $binary_string
-         *
-         * @throws TypeError
-         *
-         * @return int
-         */
-        function RandomCompat_strlen($binary_string)
-        {
-            if (!is_string($binary_string)) {
-                throw new TypeError(
-                    'RandomCompat_strlen() expects a string'
-                );
-            }
+	if (
+		defined('MB_OVERLOAD_STRING') &&
+		ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING
+	) {
+		/**
+		 * strlen() implementation that isn't brittle to mbstring.func_overload
+		 *
+		 * This version uses mb_strlen() in '8bit' mode to treat strings as raw
+		 * binary rather than UTF-8, ISO-8859-1, etc
+		 *
+		 * @param string $binary_string
+		 *
+		 * @throws TypeError
+		 *
+		 * @return int
+		 */
+		function RandomCompat_strlen($binary_string)
+		{
+			if (!is_string($binary_string)) {
+				throw new TypeError(
+					'RandomCompat_strlen() expects a string'
+				);
+			}
 
-            return mb_strlen($binary_string, '8bit');
-        }
+			return mb_strlen($binary_string, '8bit');
+		}
 
-    } else {
-        /**
-         * strlen() implementation that isn't brittle to mbstring.func_overload
-         *
-         * This version just used the default strlen()
-         *
-         * @param string $binary_string
-         *
-         * @throws TypeError
-         *
-         * @return int
-         */
-        function RandomCompat_strlen($binary_string)
-        {
-            if (!is_string($binary_string)) {
-                throw new TypeError(
-                    'RandomCompat_strlen() expects a string'
-                );
-            }
-            return strlen($binary_string);
-        }
-    }
+	} else {
+		/**
+		 * strlen() implementation that isn't brittle to mbstring.func_overload
+		 *
+		 * This version just used the default strlen()
+		 *
+		 * @param string $binary_string
+		 *
+		 * @throws TypeError
+		 *
+		 * @return int
+		 */
+		function RandomCompat_strlen($binary_string)
+		{
+			if (!is_string($binary_string)) {
+				throw new TypeError(
+					'RandomCompat_strlen() expects a string'
+				);
+			}
+			return strlen($binary_string);
+		}
+	}
 }
 
 if (!function_exists('RandomCompat_substr')) {
 
-    if (
-        defined('MB_OVERLOAD_STRING')
-        &&
-        ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING
-    ) {
-        /**
-         * substr() implementation that isn't brittle to mbstring.func_overload
-         *
-         * This version uses mb_substr() in '8bit' mode to treat strings as raw
-         * binary rather than UTF-8, ISO-8859-1, etc
-         *
-         * @param string $binary_string
-         * @param int $start
-         * @param int $length (optional)
-         *
-         * @throws TypeError
-         *
-         * @return string
-         */
-        function RandomCompat_substr($binary_string, $start, $length = null)
-        {
-            if (!is_string($binary_string)) {
-                throw new TypeError(
-                    'RandomCompat_substr(): First argument should be a string'
-                );
-            }
+	if (
+		defined('MB_OVERLOAD_STRING')
+		&&
+		ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING
+	) {
+		/**
+		 * substr() implementation that isn't brittle to mbstring.func_overload
+		 *
+		 * This version uses mb_substr() in '8bit' mode to treat strings as raw
+		 * binary rather than UTF-8, ISO-8859-1, etc
+		 *
+		 * @param string $binary_string
+		 * @param int $start
+		 * @param int $length (optional)
+		 *
+		 * @throws TypeError
+		 *
+		 * @return string
+		 */
+		function RandomCompat_substr($binary_string, $start, $length = null)
+		{
+			if (!is_string($binary_string)) {
+				throw new TypeError(
+					'RandomCompat_substr(): First argument should be a string'
+				);
+			}
 
-            if (!is_int($start)) {
-                throw new TypeError(
-                    'RandomCompat_substr(): Second argument should be an integer'
-                );
-            }
+			if (!is_int($start)) {
+				throw new TypeError(
+					'RandomCompat_substr(): Second argument should be an integer'
+				);
+			}
 
-            if ($length === null) {
-                /**
-                 * mb_substr($str, 0, NULL, '8bit') returns an empty string on
-                 * PHP 5.3, so we have to find the length ourselves.
-                 */
-                $length = RandomCompat_strlen($length) - $start;
-            } elseif (!is_int($length)) {
-                throw new TypeError(
-                    'RandomCompat_substr(): Third argument should be an integer, or omitted'
-                );
-            }
+			if ($length === null) {
+				/**
+				 * mb_substr($str, 0, NULL, '8bit') returns an empty string on
+				 * PHP 5.3, so we have to find the length ourselves.
+				 */
+				$length = RandomCompat_strlen($length) - $start;
+			} elseif (!is_int($length)) {
+				throw new TypeError(
+					'RandomCompat_substr(): Third argument should be an integer, or omitted'
+				);
+			}
 
-            return mb_substr($binary_string, $start, $length, '8bit');
-        }
+			return mb_substr($binary_string, $start, $length, '8bit');
+		}
 
-    } else {
+	} else {
 
-        /**
-         * substr() implementation that isn't brittle to mbstring.func_overload
-         *
-         * This version just uses the default substr()
-         *
-         * @param string $binary_string
-         * @param int $start
-         * @param int $length (optional)
-         *
-         * @throws TypeError
-         *
-         * @return string
-         */
-        function RandomCompat_substr($binary_string, $start, $length = null)
-        {
-            if (!is_string($binary_string)) {
-                throw new TypeError(
-                    'RandomCompat_substr(): First argument should be a string'
-                );
-            }
+		/**
+		 * substr() implementation that isn't brittle to mbstring.func_overload
+		 *
+		 * This version just uses the default substr()
+		 *
+		 * @param string $binary_string
+		 * @param int $start
+		 * @param int $length (optional)
+		 *
+		 * @throws TypeError
+		 *
+		 * @return string
+		 */
+		function RandomCompat_substr($binary_string, $start, $length = null)
+		{
+			if (!is_string($binary_string)) {
+				throw new TypeError(
+					'RandomCompat_substr(): First argument should be a string'
+				);
+			}
 
-            if (!is_int($start)) {
-                throw new TypeError(
-                    'RandomCompat_substr(): Second argument should be an integer'
-                );
-            }
+			if (!is_int($start)) {
+				throw new TypeError(
+					'RandomCompat_substr(): Second argument should be an integer'
+				);
+			}
 
-            if ($length !== null) {
-                if (!is_int($length)) {
-                    throw new TypeError(
-                        'RandomCompat_substr(): Third argument should be an integer, or omitted'
-                    );
-                }
+			if ($length !== null) {
+				if (!is_int($length)) {
+					throw new TypeError(
+						'RandomCompat_substr(): Third argument should be an integer, or omitted'
+					);
+				}
 
-                return substr($binary_string, $start, $length);
-            }
+				return substr($binary_string, $start, $length);
+			}
 
-            return substr($binary_string, $start);
-        }
-    }
+			return substr($binary_string, $start);
+		}
+	}
 }

src/wp-includes/random_compat/random_bytes_dev_urandom.php

Spacing +4 added lines, -4 removed lines

@@ -26,7 +26,7 @@ 
  * SOFTWARE.
  */
 
-if (!defined('RANDOM_COMPAT_READ_BUFFER')) {
+if ( ! defined('RANDOM_COMPAT_READ_BUFFER')) {
     define('RANDOM_COMPAT_READ_BUFFER', 8);
 }
 
@@ -55,7 +55,7 @@ 
          * We never fall back to /dev/random
          */
         $fp = fopen('/dev/urandom', 'rb');
-        if (!empty($fp)) {
+        if ( ! empty($fp)) {
             $st = fstat($fp);
             if (($st['mode'] & 0170000) !== 020000) {
                 fclose($fp);
@@ -63,7 +63,7 @@ 
             }
         }
 
-        if (!empty($fp)) {
+        if ( ! empty($fp)) {
             /**
              * stream_set_read_buffer() does not exist in HHVM
              * 
@@ -102,7 +102,7 @@ 
      * if (empty($fp)) line is logic that should only be run once per
      * page load.
      */
-    if (!empty($fp)) {
+    if ( ! empty($fp)) {
         $remaining = $bytes;
         $buf = '';
 

Indentation +94 added lines, -94 removed lines

@@ -27,7 +27,7 @@ 
  */
 
 if (!defined('RANDOM_COMPAT_READ_BUFFER')) {
-    define('RANDOM_COMPAT_READ_BUFFER', 8);
+	define('RANDOM_COMPAT_READ_BUFFER', 8);
 }
 
 /**
@@ -45,104 +45,104 @@ 
  */
 function random_bytes($bytes)
 {
-    static $fp = null;
-    /**
-     * This block should only be run once
-     */
-    if (empty($fp)) {
-        /**
-         * We use /dev/urandom if it is a char device.
-         * We never fall back to /dev/random
-         */
-        $fp = fopen('/dev/urandom', 'rb');
-        if (!empty($fp)) {
-            $st = fstat($fp);
-            if (($st['mode'] & 0170000) !== 020000) {
-                fclose($fp);
-                $fp = false;
-            }
-        }
+	static $fp = null;
+	/**
+	 * This block should only be run once
+	 */
+	if (empty($fp)) {
+		/**
+		 * We use /dev/urandom if it is a char device.
+		 * We never fall back to /dev/random
+		 */
+		$fp = fopen('/dev/urandom', 'rb');
+		if (!empty($fp)) {
+			$st = fstat($fp);
+			if (($st['mode'] & 0170000) !== 020000) {
+				fclose($fp);
+				$fp = false;
+			}
+		}
 
-        if (!empty($fp)) {
-            /**
-             * stream_set_read_buffer() does not exist in HHVM
-             * 
-             * If we don't set the stream's read buffer to 0, PHP will
-             * internally buffer 8192 bytes, which can waste entropy
-             * 
-             * stream_set_read_buffer returns 0 on success
-             */
-            if (function_exists('stream_set_read_buffer')) {
-                stream_set_read_buffer($fp, RANDOM_COMPAT_READ_BUFFER);
-            }
-            if (function_exists('stream_set_chunk_size')) {
-                stream_set_chunk_size($fp, RANDOM_COMPAT_READ_BUFFER);
-            }
-        }
-    }
+		if (!empty($fp)) {
+			/**
+			 * stream_set_read_buffer() does not exist in HHVM
+			 * 
+			 * If we don't set the stream's read buffer to 0, PHP will
+			 * internally buffer 8192 bytes, which can waste entropy
+			 * 
+			 * stream_set_read_buffer returns 0 on success
+			 */
+			if (function_exists('stream_set_read_buffer')) {
+				stream_set_read_buffer($fp, RANDOM_COMPAT_READ_BUFFER);
+			}
+			if (function_exists('stream_set_chunk_size')) {
+				stream_set_chunk_size($fp, RANDOM_COMPAT_READ_BUFFER);
+			}
+		}
+	}
 
-    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'
+		);
+	}
 
-    /**
-     * This if() block only runs if we managed to open a file handle
-     * 
-     * It does not belong in an else {} block, because the above 
-     * if (empty($fp)) line is logic that should only be run once per
-     * page load.
-     */
-    if (!empty($fp)) {
-        $remaining = $bytes;
-        $buf = '';
+	/**
+	 * This if() block only runs if we managed to open a file handle
+	 * 
+	 * It does not belong in an else {} block, because the above 
+	 * if (empty($fp)) line is logic that should only be run once per
+	 * page load.
+	 */
+	if (!empty($fp)) {
+		$remaining = $bytes;
+		$buf = '';
 
-        /**
-         * We use fread() in a loop to protect against partial reads
-         */
-        do {
-            $read = fread($fp, $remaining); 
-            if ($read === false) {
-                /**
-                 * We cannot safely read from the file. Exit the
-                 * do-while loop and trigger the exception condition
-                 */
-                $buf = false;
-                break;
-            }
-            /**
-             * Decrease the number of bytes returned from remaining
-             */
-            $remaining -= RandomCompat_strlen($read);
-            $buf .= $read;
-        } while ($remaining > 0);
+		/**
+		 * We use fread() in a loop to protect against partial reads
+		 */
+		do {
+			$read = fread($fp, $remaining); 
+			if ($read === false) {
+				/**
+				 * We cannot safely read from the file. Exit the
+				 * do-while loop and trigger the exception condition
+				 */
+				$buf = false;
+				break;
+			}
+			/**
+			 * Decrease the number of bytes returned from remaining
+			 */
+			$remaining -= RandomCompat_strlen($read);
+			$buf .= $read;
+		} while ($remaining > 0);
         
-        /**
-         * Is our result valid?
-         */
-        if ($buf !== false) {
-            if (RandomCompat_strlen($buf) === $bytes) {
-                /**
-                 * Return our random entropy buffer here:
-                 */
-                return $buf;
-            }
-        }
-    }
+		/**
+		 * Is our result valid?
+		 */
+		if ($buf !== false) {
+			if (RandomCompat_strlen($buf) === $bytes) {
+				/**
+				 * Return our random entropy buffer here:
+				 */
+				return $buf;
+			}
+		}
+	}
 
-    /**
-     * If we reach here, PHP has failed us.
-     */
-    throw new Exception(
-        'Error reading from source device'
-    );
+	/**
+	 * If we reach here, PHP has failed us.
+	 */
+	throw new Exception(
+		'Error reading from source device'
+	);
 }

src/wp-includes/random_compat/random_int.php

Spacing +2 added lines, -2 removed lines

@@ -99,7 +99,7 @@ 
     /**
      * Test for integer overflow:
      */
-    if (!is_int($range)) {
+    if ( ! is_int($range)) {
 
         /**
          * Still safely calculate wider ranges.
@@ -185,7 +185,7 @@ 
          * ... or smaller than $min,
          * then try again.
          */
-    } while (!is_int($val) || $val > $max || $val < $min);
+    } while ( ! is_int($val) || $val > $max || $val < $min);
 
     return (int) $val;
 }

Indentation +134 added lines, -134 removed lines

@@ -38,154 +38,154 @@
  */
 function random_int($min, $max)
 {
-    /**
-     * Type and input logic checks
-     * 
-     * If you pass it a float in the range (~PHP_INT_MAX, PHP_INT_MAX)
-     * (non-inclusive), it will sanely cast it to an int. If you it's equal to
-     * ~PHP_INT_MAX or PHP_INT_MAX, we let it fail as not an integer. Floats 
-     * lose precision, so the <= and => operators might accidentally let a float
-     * through.
-     */
+	/**
+	 * Type and input logic checks
+	 * 
+	 * If you pass it a float in the range (~PHP_INT_MAX, PHP_INT_MAX)
+	 * (non-inclusive), it will sanely cast it to an int. If you it's equal to
+	 * ~PHP_INT_MAX or PHP_INT_MAX, we let it fail as not an integer. Floats 
+	 * lose precision, so the <= and => operators might accidentally let a float
+	 * through.
+	 */
     
-    try {
-        $min = RandomCompat_intval($min);
-    } catch (TypeError $ex) {
-        throw new TypeError(
-            'random_int(): $min must be an integer'
-        );
-    }
+	try {
+		$min = RandomCompat_intval($min);
+	} catch (TypeError $ex) {
+		throw new TypeError(
+			'random_int(): $min must be an integer'
+		);
+	}
 
-    try {
-        $max = RandomCompat_intval($max);
-    } catch (TypeError $ex) {
-        throw new TypeError(
-            'random_int(): $max must be an integer'
-        );
-    }
+	try {
+		$max = RandomCompat_intval($max);
+	} catch (TypeError $ex) {
+		throw new TypeError(
+			'random_int(): $max must be an integer'
+		);
+	}
     
-    /**
-     * Now that we've verified our weak typing system has given us an integer,
-     * let's validate the logic then we can move forward with generating random
-     * integers along a given range.
-     */
-    if ($min > $max) {
-        throw new Error(
-            'Minimum value must be less than or equal to the maximum value'
-        );
-    }
+	/**
+	 * Now that we've verified our weak typing system has given us an integer,
+	 * let's validate the logic then we can move forward with generating random
+	 * integers along a given range.
+	 */
+	if ($min > $max) {
+		throw new Error(
+			'Minimum value must be less than or equal to the maximum value'
+		);
+	}
 
-    if ($max === $min) {
-        return $min;
-    }
+	if ($max === $min) {
+		return $min;
+	}
 
-    /**
-     * Initialize variables to 0
-     * 
-     * We want to store:
-     * $bytes => the number of random bytes we need
-     * $mask => an integer bitmask (for use with the &) operator
-     *          so we can minimize the number of discards
-     */
-    $attempts = $bits = $bytes = $mask = $valueShift = 0;
+	/**
+	 * Initialize variables to 0
+	 * 
+	 * We want to store:
+	 * $bytes => the number of random bytes we need
+	 * $mask => an integer bitmask (for use with the &) operator
+	 *          so we can minimize the number of discards
+	 */
+	$attempts = $bits = $bytes = $mask = $valueShift = 0;
 
-    /**
-     * At this point, $range is a positive number greater than 0. It might
-     * overflow, however, if $max - $min > PHP_INT_MAX. PHP will cast it to
-     * a float and we will lose some precision.
-     */
-    $range = $max - $min;
+	/**
+	 * At this point, $range is a positive number greater than 0. It might
+	 * overflow, however, if $max - $min > PHP_INT_MAX. PHP will cast it to
+	 * a float and we will lose some precision.
+	 */
+	$range = $max - $min;
 
-    /**
-     * Test for integer overflow:
-     */
-    if (!is_int($range)) {
+	/**
+	 * Test for integer overflow:
+	 */
+	if (!is_int($range)) {
 
-        /**
-         * Still safely calculate wider ranges.
-         * Provided by @CodesInChaos, @oittaa
-         * 
-         * @ref https://gist.github.com/CodesInChaos/03f9ea0b58e8b2b8d435
-         * 
-         * We use ~0 as a mask in this case because it generates all 1s
-         * 
-         * @ref https://eval.in/400356 (32-bit)
-         * @ref http://3v4l.org/XX9r5  (64-bit)
-         */
-        $bytes = PHP_INT_SIZE;
-        $mask = ~0;
+		/**
+		 * Still safely calculate wider ranges.
+		 * Provided by @CodesInChaos, @oittaa
+		 * 
+		 * @ref https://gist.github.com/CodesInChaos/03f9ea0b58e8b2b8d435
+		 * 
+		 * We use ~0 as a mask in this case because it generates all 1s
+		 * 
+		 * @ref https://eval.in/400356 (32-bit)
+		 * @ref http://3v4l.org/XX9r5  (64-bit)
+		 */
+		$bytes = PHP_INT_SIZE;
+		$mask = ~0;
 
-    } else {
+	} else {
 
-        /**
-         * $bits is effectively ceil(log($range, 2)) without dealing with 
-         * type juggling
-         */
-        while ($range > 0) {
-            if ($bits % 8 === 0) {
-               ++$bytes;
-            }
-            ++$bits;
-            $range >>= 1;
-            $mask = $mask << 1 | 1;
-        }
-        $valueShift = $min;
-    }
+		/**
+		 * $bits is effectively ceil(log($range, 2)) without dealing with 
+		 * type juggling
+		 */
+		while ($range > 0) {
+			if ($bits % 8 === 0) {
+			   ++$bytes;
+			}
+			++$bits;
+			$range >>= 1;
+			$mask = $mask << 1 | 1;
+		}
+		$valueShift = $min;
+	}
 
-    /**
-     * Now that we have our parameters set up, let's begin generating
-     * random integers until one falls between $min and $max
-     */
-    do {
-        /**
-         * The rejection probability is at most 0.5, so this corresponds
-         * to a failure probability of 2^-128 for a working RNG
-         */
-        if ($attempts > 128) {
-            throw new Exception(
-                'random_int: RNG is broken - too many rejections'
-            );
-        }
+	/**
+	 * Now that we have our parameters set up, let's begin generating
+	 * random integers until one falls between $min and $max
+	 */
+	do {
+		/**
+		 * The rejection probability is at most 0.5, so this corresponds
+		 * to a failure probability of 2^-128 for a working RNG
+		 */
+		if ($attempts > 128) {
+			throw new Exception(
+				'random_int: RNG is broken - too many rejections'
+			);
+		}
 
-        /**
-         * Let's grab the necessary number of random bytes
-         */
-        $randomByteString = random_bytes($bytes);
-        if ($randomByteString === false) {
-            throw new Exception(
-                'Random number generator failure'
-            );
-        }
+		/**
+		 * Let's grab the necessary number of random bytes
+		 */
+		$randomByteString = random_bytes($bytes);
+		if ($randomByteString === false) {
+			throw new Exception(
+				'Random number generator failure'
+			);
+		}
 
-        /**
-         * Let's turn $randomByteString into an integer
-         * 
-         * This uses bitwise operators (<< and |) to build an integer
-         * out of the values extracted from ord()
-         * 
-         * Example: [9F] | [6D] | [32] | [0C] =>
-         *   159 + 27904 + 3276800 + 201326592 =>
-         *   204631455
-         */
-        $val = 0;
-        for ($i = 0; $i < $bytes; ++$i) {
-            $val |= ord($randomByteString[$i]) << ($i * 8);
-        }
+		/**
+		 * Let's turn $randomByteString into an integer
+		 * 
+		 * This uses bitwise operators (<< and |) to build an integer
+		 * out of the values extracted from ord()
+		 * 
+		 * Example: [9F] | [6D] | [32] | [0C] =>
+		 *   159 + 27904 + 3276800 + 201326592 =>
+		 *   204631455
+		 */
+		$val = 0;
+		for ($i = 0; $i < $bytes; ++$i) {
+			$val |= ord($randomByteString[$i]) << ($i * 8);
+		}
 
-        /**
-         * Apply mask
-         */
-        $val &= $mask;
-        $val += $valueShift;
+		/**
+		 * Apply mask
+		 */
+		$val &= $mask;
+		$val += $valueShift;
 
-        ++$attempts;
-        /**
-         * If $val overflows to a floating point number,
-         * ... or is larger than $max,
-         * ... or smaller than $min,
-         * then try again.
-         */
-    } while (!is_int($val) || $val > $max || $val < $min);
+		++$attempts;
+		/**
+		 * If $val overflows to a floating point number,
+		 * ... or is larger than $max,
+		 * ... or smaller than $min,
+		 * then try again.
+		 */
+	} while (!is_int($val) || $val > $max || $val < $min);
 
-    return (int) $val;
+	return (int) $val;
 }

src/wp-includes/random_compat/cast_to_int.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
  * SOFTWARE.
  */
 
-if (!function_exists('RandomCompat_intval')) {
+if ( ! function_exists('RandomCompat_intval')) {
     
     /**
      * Cast to an integer if we can, safely.

Indentation +37 added lines, -37 removed lines

@@ -28,44 +28,44 @@
 
 if (!function_exists('RandomCompat_intval')) {
     
-    /**
-     * Cast to an integer if we can, safely.
-     * 
-     * If you pass it a float in the range (~PHP_INT_MAX, PHP_INT_MAX)
-     * (non-inclusive), it will sanely cast it to an int. If you it's equal to
-     * ~PHP_INT_MAX or PHP_INT_MAX, we let it fail as not an integer. Floats 
-     * lose precision, so the <= and => operators might accidentally let a float
-     * through.
-     * 
-     * @param int|float $number    The number we want to convert to an int
-     * @param boolean   $fail_open Set to true to not throw an exception
-     * 
-     * @return int (or float if $fail_open)
-     *
-     * @throws TypeError
-     */
-    function RandomCompat_intval($number, $fail_open = false)
-    {
-        if (is_numeric($number)) {
-            $number += 0;
-        }
+	/**
+	 * Cast to an integer if we can, safely.
+	 * 
+	 * If you pass it a float in the range (~PHP_INT_MAX, PHP_INT_MAX)
+	 * (non-inclusive), it will sanely cast it to an int. If you it's equal to
+	 * ~PHP_INT_MAX or PHP_INT_MAX, we let it fail as not an integer. Floats 
+	 * lose precision, so the <= and => operators might accidentally let a float
+	 * through.
+	 * 
+	 * @param int|float $number    The number we want to convert to an int
+	 * @param boolean   $fail_open Set to true to not throw an exception
+	 * 
+	 * @return int (or float if $fail_open)
+	 *
+	 * @throws TypeError
+	 */
+	function RandomCompat_intval($number, $fail_open = false)
+	{
+		if (is_numeric($number)) {
+			$number += 0;
+		}
 
-        if (
-            is_float($number)
-            &&
-            $number > ~PHP_INT_MAX
-            &&
-            $number < PHP_INT_MAX
-        ) {
-            $number = (int) $number;
-        }
+		if (
+			is_float($number)
+			&&
+			$number > ~PHP_INT_MAX
+			&&
+			$number < PHP_INT_MAX
+		) {
+			$number = (int) $number;
+		}
 
-        if (is_int($number) || $fail_open) {
-            return $number;
-        }
+		if (is_int($number) || $fail_open) {
+			return $number;
+		}
 
-        throw new TypeError(
-            'Expected an integer.'
-        );
-    }
+		throw new TypeError(
+			'Expected an integer.'
+		);
+	}
 }

src/wp-includes/random_compat/error_polyfill.php

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
  * SOFTWARE.
  */
 
-if (!class_exists('Error', false)) {
+if ( ! class_exists('Error', false)) {
     // We can't really avoid making this extend Exception in PHP 5.
     class Error extends Exception
     {
@@ -34,7 +34,7 @@ 
     }
 }
 
-if (!class_exists('TypeError', false)) {
+if ( ! class_exists('TypeError', false)) {
     class TypeError extends Error
     {
         

Indentation +7 added lines, -7 removed lines

@@ -27,16 +27,16 @@
  */
 
 if (!class_exists('Error', false)) {
-    // We can't really avoid making this extend Exception in PHP 5.
-    class Error extends Exception
-    {
+	// We can't really avoid making this extend Exception in PHP 5.
+	class Error extends Exception
+	{
         
-    }
+	}
 }
 
 if (!class_exists('TypeError', false)) {
-    class TypeError extends Error
-    {
+	class TypeError extends Error
+	{
         
-    }
+	}
 }

src/wp-includes/category.php

Braces +12 added lines, -8 removed lines

@@ -90,8 +90,9 @@ 
 function get_category( $category, $output = OBJECT, $filter = 'raw' ) {
 	$category = get_term( $category, 'category', $output, $filter );
 
-	if ( is_wp_error( $category ) )
-		return $category;
+	if ( is_wp_error( $category ) ) {
+			return $category;
+	}
 
 	_make_cat_compat( $category );
 
@@ -170,8 +171,9 @@ 
  */
 function get_category_by_slug( $slug  ) {
 	$category = get_term_by( 'slug', $slug, 'category' );
-	if ( $category )
-		_make_cat_compat( $category );
+	if ( $category ) {
+			_make_cat_compat( $category );
+	}
 
 	return $category;
 }
@@ -186,8 +188,9 @@ 
  */
 function get_cat_ID( $cat_name ) {
 	$cat = get_term_by( 'name', $cat_name, 'category' );
-	if ( $cat )
-		return $cat->term_id;
+	if ( $cat ) {
+			return $cat->term_id;
+	}
 	return 0;
 }
 
@@ -202,8 +205,9 @@ 
 function get_cat_name( $cat_id ) {
 	$cat_id = (int) $cat_id;
 	$category = get_term( $cat_id, 'category' );
-	if ( ! $category || is_wp_error( $category ) )
-		return '';
+	if ( ! $category || is_wp_error( $category ) ) {
+			return '';
+	}
 	return $category->name;
 }
 

Spacing +65 added lines, -65 removed lines

@@ -23,9 +23,9 @@ 
  * }
  * @return array List of categories.
  */
-function get_categories( $args = '' ) {
-	$defaults = array( 'taxonomy' => 'category' );
-	$args = wp_parse_args( $args, $defaults );
+function get_categories($args = '') {
+	$defaults = array('taxonomy' => 'category');
+	$args = wp_parse_args($args, $defaults);
 
 	$taxonomy = $args['taxonomy'];
 
@@ -37,13 +37,13 @@ 
 	 * @param string $taxonomy Taxonomy to retrieve terms from.
 	 * @param array  $args     An array of arguments. See get_terms().
 	 */
-	$taxonomy = apply_filters( 'get_categories_taxonomy', $taxonomy, $args );
+	$taxonomy = apply_filters('get_categories_taxonomy', $taxonomy, $args);
 
 	// Back compat
-	if ( isset($args['type']) && 'link' == $args['type'] ) {
-		_deprecated_argument( __FUNCTION__, '3.0.0',
+	if (isset($args['type']) && 'link' == $args['type']) {
+		_deprecated_argument(__FUNCTION__, '3.0.0',
 			/* translators: 1: "type => link", 2: "taxonomy => link_category" */
-			sprintf( __( '%1$s is deprecated. Use %2$s instead.' ),
+			sprintf(__('%1$s is deprecated. Use %2$s instead.'),
 				'<code>type => link</code>',
 				'<code>taxonomy => link_category</code>'
 			)
@@ -51,14 +51,14 @@ 
 		$taxonomy = $args['taxonomy'] = 'link_category';
 	}
 
-	$categories = get_terms( $taxonomy, $args );
+	$categories = get_terms($taxonomy, $args);
 
-	if ( is_wp_error( $categories ) ) {
+	if (is_wp_error($categories)) {
 		$categories = array();
 	} else {
 		$categories = (array) $categories;
-		foreach ( array_keys( $categories ) as $k ) {
-			_make_cat_compat( $categories[ $k ] );
+		foreach (array_keys($categories) as $k) {
+			_make_cat_compat($categories[$k]);
 		}
 	}
 
@@ -88,13 +88,13 @@ 
  * @return object|array|WP_Error|null Category data in type defined by $output parameter.
  *                                    WP_Error if $category is empty, null if it does not exist.
  */
-function get_category( $category, $output = OBJECT, $filter = 'raw' ) {
-	$category = get_term( $category, 'category', $output, $filter );
+function get_category($category, $output = OBJECT, $filter = 'raw') {
+	$category = get_term($category, 'category', $output, $filter);
 
-	if ( is_wp_error( $category ) )
+	if (is_wp_error($category))
 		return $category;
 
-	_make_cat_compat( $category );
+	_make_cat_compat($category);
 
 	return $category;
 }
@@ -119,45 +119,45 @@ 
  *                              a WP_Term object, an associative array, or a numeric array, respectively. Default OBJECT.
  * @return WP_Term|array|WP_Error|null Type is based on $output value.
  */
-function get_category_by_path( $category_path, $full_match = true, $output = OBJECT ) {
-	$category_path = rawurlencode( urldecode( $category_path ) );
-	$category_path = str_replace( '%2F', '/', $category_path );
-	$category_path = str_replace( '%20', ' ', $category_path );
-	$category_paths = '/' . trim( $category_path, '/' );
-	$leaf_path  = sanitize_title( basename( $category_paths ) );
-	$category_paths = explode( '/', $category_paths );
+function get_category_by_path($category_path, $full_match = true, $output = OBJECT) {
+	$category_path = rawurlencode(urldecode($category_path));
+	$category_path = str_replace('%2F', '/', $category_path);
+	$category_path = str_replace('%20', ' ', $category_path);
+	$category_paths = '/'.trim($category_path, '/');
+	$leaf_path = sanitize_title(basename($category_paths));
+	$category_paths = explode('/', $category_paths);
 	$full_path = '';
-	foreach ( (array) $category_paths as $pathdir ) {
-		$full_path .= ( $pathdir != '' ? '/' : '' ) . sanitize_title( $pathdir );
+	foreach ((array) $category_paths as $pathdir) {
+		$full_path .= ($pathdir != '' ? '/' : '').sanitize_title($pathdir);
 	}
-	$categories = get_terms( 'category', array('get' => 'all', 'slug' => $leaf_path) );
+	$categories = get_terms('category', array('get' => 'all', 'slug' => $leaf_path));
 
-	if ( empty( $categories ) ) {
+	if (empty($categories)) {
 		return;
 	}
 
-	foreach ( $categories as $category ) {
-		$path = '/' . $leaf_path;
+	foreach ($categories as $category) {
+		$path = '/'.$leaf_path;
 		$curcategory = $category;
-		while ( ( $curcategory->parent != 0 ) && ( $curcategory->parent != $curcategory->term_id ) ) {
-			$curcategory = get_term( $curcategory->parent, 'category' );
-			if ( is_wp_error( $curcategory ) ) {
+		while (($curcategory->parent != 0) && ($curcategory->parent != $curcategory->term_id)) {
+			$curcategory = get_term($curcategory->parent, 'category');
+			if (is_wp_error($curcategory)) {
 				return $curcategory;
 			}
-			$path = '/' . $curcategory->slug . $path;
+			$path = '/'.$curcategory->slug.$path;
 		}
 
-		if ( $path == $full_path ) {
-			$category = get_term( $category->term_id, 'category', $output );
-			_make_cat_compat( $category );
+		if ($path == $full_path) {
+			$category = get_term($category->term_id, 'category', $output);
+			_make_cat_compat($category);
 			return $category;
 		}
 	}
 
 	// If full matching is not required, return the first cat that matches the leaf.
-	if ( ! $full_match ) {
-		$category = get_term( reset( $categories )->term_id, 'category', $output );
-		_make_cat_compat( $category );
+	if ( ! $full_match) {
+		$category = get_term(reset($categories)->term_id, 'category', $output);
+		_make_cat_compat($category);
 		return $category;
 	}
 }
@@ -170,10 +170,10 @@ 
  * @param string $slug The category slug.
  * @return object Category data object
  */
-function get_category_by_slug( $slug  ) {
-	$category = get_term_by( 'slug', $slug, 'category' );
-	if ( $category )
-		_make_cat_compat( $category );
+function get_category_by_slug($slug) {
+	$category = get_term_by('slug', $slug, 'category');
+	if ($category)
+		_make_cat_compat($category);
 
 	return $category;
 }
@@ -186,9 +186,9 @@ 
  * @param string $cat_name Category name.
  * @return int 0, if failure and ID of category on success.
  */
-function get_cat_ID( $cat_name ) {
-	$cat = get_term_by( 'name', $cat_name, 'category' );
-	if ( $cat )
+function get_cat_ID($cat_name) {
+	$cat = get_term_by('name', $cat_name, 'category');
+	if ($cat)
 		return $cat->term_id;
 	return 0;
 }
@@ -201,10 +201,10 @@ 
  * @param int $cat_id Category ID
  * @return string Category name, or an empty string if category doesn't exist.
  */
-function get_cat_name( $cat_id ) {
+function get_cat_name($cat_id) {
 	$cat_id = (int) $cat_id;
-	$category = get_term( $cat_id, 'category' );
-	if ( ! $category || is_wp_error( $category ) )
+	$category = get_term($cat_id, 'category');
+	if ( ! $category || is_wp_error($category))
 		return '';
 	return $category->name;
 }
@@ -221,8 +221,8 @@ 
  * @param int|object $cat2 The child category.
  * @return bool Whether $cat2 is child of $cat1
  */
-function cat_is_ancestor_of( $cat1, $cat2 ) {
-	return term_is_ancestor_of( $cat1, $cat2, 'category' );
+function cat_is_ancestor_of($cat1, $cat2) {
+	return term_is_ancestor_of($cat1, $cat2, 'category');
 }
 
 /**
@@ -234,8 +234,8 @@ 
  * @param string $context Optional. Default is 'display'.
  * @return object|array Same type as $category with sanitized data for safe use.
  */
-function sanitize_category( $category, $context = 'display' ) {
-	return sanitize_term( $category, 'category', $context );
+function sanitize_category($category, $context = 'display') {
+	return sanitize_term($category, 'category', $context);
 }
 
 /**
@@ -249,8 +249,8 @@ 
  * @param string $context What filter to use, 'raw', 'display', etc.
  * @return mixed Same type as $value after $value has been sanitized.
  */
-function sanitize_category_field( $field, $value, $cat_id, $context ) {
-	return sanitize_term_field( $field, $value, $cat_id, 'category', $context );
+function sanitize_category_field($field, $value, $cat_id, $context) {
+	return sanitize_term_field($field, $value, $cat_id, 'category', $context);
 }
 
 /* Tags */
@@ -264,10 +264,10 @@ 
  * @param string|array $args Tag arguments to use when retrieving tags.
  * @return array List of tags.
  */
-function get_tags( $args = '' ) {
-	$tags = get_terms( 'post_tag', $args );
+function get_tags($args = '') {
+	$tags = get_terms('post_tag', $args);
 
-	if ( empty( $tags ) ) {
+	if (empty($tags)) {
 		$return = array();
 		return $return;
 	}
@@ -280,7 +280,7 @@ 
 	 * @param array $tags Array of 'post_tag' term objects.
 	 * @param array $args An array of arguments. @see get_terms()
 	 */
-	$tags = apply_filters( 'get_tags', $tags, $args );
+	$tags = apply_filters('get_tags', $tags, $args);
 	return $tags;
 }
 
@@ -304,8 +304,8 @@ 
  * @param string             $filter Optional. Default is raw or no WordPress defined filter will applied.
  * @return WP_Term|array|WP_Error|null Tag data in type defined by $output parameter. WP_Error if $tag is empty, null if it does not exist.
  */
-function get_tag( $tag, $output = OBJECT, $filter = 'raw' ) {
-	return get_term( $tag, 'post_tag', $output, $filter );
+function get_tag($tag, $output = OBJECT, $filter = 'raw') {
+	return get_term($tag, 'post_tag', $output, $filter);
 }
 
 /* Cache */
@@ -317,8 +317,8 @@ 
  *
  * @param int $id Category ID
  */
-function clean_category_cache( $id ) {
-	clean_term_cache( $id, 'category' );
+function clean_category_cache($id) {
+	clean_term_cache($id, 'category');
 }
 
 /**
@@ -341,15 +341,15 @@ 
  *
  * @param array|object|WP_Term $category Category Row object or array
  */
-function _make_cat_compat( &$category ) {
-	if ( is_object( $category ) && ! is_wp_error( $category ) ) {
+function _make_cat_compat(&$category) {
+	if (is_object($category) && ! is_wp_error($category)) {
 		$category->cat_ID = $category->term_id;
 		$category->category_count = $category->count;
 		$category->category_description = $category->description;
 		$category->cat_name = $category->name;
 		$category->category_nicename = $category->slug;
 		$category->category_parent = $category->parent;
-	} elseif ( is_array( $category ) && isset( $category['term_id'] ) ) {
+	} elseif (is_array($category) && isset($category['term_id'])) {
 		$category['cat_ID'] = &$category['term_id'];
 		$category['category_count'] = &$category['count'];
 		$category['category_description'] = &$category['description'];