ntwb / wordpress

src/wp-includes/SimplePie/Net/IPv6.php

Doc Comments +1 added lines, -1 removed lines

@@ -190,7 +190,7 @@
 	 *           0:0:0:0:0:FFFF:129.144.52.38
 	 *
 	 * @param string $ip An IPv6 address
-	 * @return array [0] contains the IPv6 represented part, and [1] the IPv4 represented part
+	 * @return string[] [0] contains the IPv6 represented part, and [1] the IPv4 represented part
 	 */
 	private static function split_v6_v4($ip)
 	{

Spacing +1 added lines, -1 removed lines

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

Braces +20 added lines, -20 removed lines

@@ -86,16 +86,14 @@ 
 			if ($ip1 === '')
 			{
 				$c1 = -1;
-			}
-			else
+			} else
 			{
 				$c1 = substr_count($ip1, ':');
 			}
 			if ($ip2 === '')
 			{
 				$c2 = -1;
-			}
-			else
+			} else
 			{
 				$c2 = substr_count($ip2, ':');
 			}
@@ -173,8 +171,7 @@ 
 		if ($ip_parts[1] !== '')
 		{
 			return implode(':', $ip_parts);
-		}
-		else
+		} else
 		{
 			return $ip_parts[0];
 		}
@@ -200,8 +197,7 @@ 
 			$ipv6_part = substr($ip, 0, $pos);
 			$ipv4_part = substr($ip, $pos + 1);
 			return array($ipv6_part, $ipv4_part);
-		}
-		else
+		} else
 		{
 			return array($ip, '');
 		}
@@ -226,35 +222,39 @@ 
 			foreach ($ipv6 as $ipv6_part)
 			{
 				// The section can't be empty
-				if ($ipv6_part === '')
-					return false;
+				if ($ipv6_part === '') {
+									return false;
+				}
 
 				// Nor can it be over four characters
-				if (strlen($ipv6_part) > 4)
-					return false;
+				if (strlen($ipv6_part) > 4) {
+									return false;
+				}
 
 				// Remove leading zeros (this is safe because of the above)
 				$ipv6_part = ltrim($ipv6_part, '0');
-				if ($ipv6_part === '')
-					$ipv6_part = '0';
+				if ($ipv6_part === '') {
+									$ipv6_part = '0';
+				}
 
 				// Check the value is valid
 				$value = hexdec($ipv6_part);
-				if (dechex($value) !== strtolower($ipv6_part) || $value < 0 || $value > 0xFFFF)
-					return false;
+				if (dechex($value) !== strtolower($ipv6_part) || $value < 0 || $value > 0xFFFF) {
+									return false;
+				}
 			}
 			if (count($ipv4) === 4)
 			{
 				foreach ($ipv4 as $ipv4_part)
 				{
 					$value = (int) $ipv4_part;
-					if ((string) $value !== $ipv4_part || $value < 0 || $value > 0xFF)
-						return false;
+					if ((string) $value !== $ipv4_part || $value < 0 || $value > 0xFF) {
+											return false;
+					}
 				}
 			}
 			return true;
-		}
-		else
+		} else
 		{
 			return false;
 		}

src/wp-includes/SimplePie/Parse/Date.php

Doc Comments -1 removed lines

@@ -704,7 +704,6 @@
 	 * Remove RFC822 comments
 	 *
 	 * @access protected
-	 * @param string $data Data to strip comments from
 	 * @return string Comment stripped string
 	 */
 	public function remove_rfc2822_comments($string)

Spacing +15 added lines, -15 removed lines

@@ -541,11 +541,11 @@ 
 	 */
 	public function __construct()
 	{
-		$this->day_pcre = '(' . implode(array_keys($this->day), '|') . ')';
-		$this->month_pcre = '(' . implode(array_keys($this->month), '|') . ')';
+		$this->day_pcre = '('.implode(array_keys($this->day), '|').')';
+		$this->month_pcre = '('.implode(array_keys($this->month), '|').')';
 
 		static $cache;
-		if (!isset($cache[get_class($this)]))
+		if ( ! isset($cache[get_class($this)]))
 		{
 			$all_methods = get_class_methods($this);
 
@@ -572,7 +572,7 @@ 
 	public static function get()
 	{
 		static $object;
-		if (!$object)
+		if ( ! $object)
 		{
 			$object = new SimplePie_Parse_Date;
 		}
@@ -638,13 +638,13 @@ 
 	public function date_w3cdtf($date)
 	{
 		static $pcre;
-		if (!$pcre)
+		if ( ! $pcre)
 		{
 			$year = '([0-9]{4})';
 			$month = $day = $hour = $minute = $second = '([0-9]{2})';
 			$decimal = '([0-9]*)';
 			$zone = '(?:(Z)|([+\-])([0-9]{1,2}):?([0-9]{1,2}))';
-			$pcre = '/^' . $year . '(?:-?' . $month . '(?:-?' . $day . '(?:[Tt\x09\x20]+' . $hour . '(?::?' . $minute . '(?::?' . $second . '(?:.' . $decimal . ')?)?)?' . $zone . ')?)?)?$/';
+			$pcre = '/^'.$year.'(?:-?'.$month.'(?:-?'.$day.'(?:[Tt\x09\x20]+'.$hour.'(?::?'.$minute.'(?::?'.$second.'(?:.'.$decimal.')?)?)?'.$zone.')?)?)?$/';
 		}
 		if (preg_match($pcre, $date, $match))
 		{
@@ -770,11 +770,11 @@ 
 	public function date_rfc2822($date)
 	{
 		static $pcre;
-		if (!$pcre)
+		if ( ! $pcre)
 		{
 			$wsp = '[\x09\x20]';
-			$fws = '(?:' . $wsp . '+|' . $wsp . '*(?:\x0D\x0A' . $wsp . '+)+)';
-			$optional_fws = $fws . '?';
+			$fws = '(?:'.$wsp.'+|'.$wsp.'*(?:\x0D\x0A'.$wsp.'+)+)';
+			$optional_fws = $fws.'?';
 			$day_name = $this->day_pcre;
 			$month = $this->month_pcre;
 			$day = '([0-9]{1,2})';
@@ -782,8 +782,8 @@ 
 			$year = '([0-9]{2,4})';
 			$num_zone = '([+\-])([0-9]{2})([0-9]{2})';
 			$character_zone = '([A-Z]{1,5})';
-			$zone = '(?:' . $num_zone . '|' . $character_zone . ')';
-			$pcre = '/(?:' . $optional_fws . $day_name . $optional_fws . ',)?' . $optional_fws . $day . $fws . $month . $fws . $year . $fws . $hour . $optional_fws . ':' . $optional_fws . $minute . '(?:' . $optional_fws . ':' . $optional_fws . $second . ')?' . $fws . $zone . '/i';
+			$zone = '(?:'.$num_zone.'|'.$character_zone.')';
+			$pcre = '/(?:'.$optional_fws.$day_name.$optional_fws.',)?'.$optional_fws.$day.$fws.$month.$fws.$year.$fws.$hour.$optional_fws.':'.$optional_fws.$minute.'(?:'.$optional_fws.':'.$optional_fws.$second.')?'.$fws.$zone.'/i';
 		}
 		if (preg_match($pcre, $this->remove_rfc2822_comments($date), $match))
 		{
@@ -863,7 +863,7 @@ 
 	public function date_rfc850($date)
 	{
 		static $pcre;
-		if (!$pcre)
+		if ( ! $pcre)
 		{
 			$space = '[\x09\x20]+';
 			$day_name = $this->day_pcre;
@@ -871,7 +871,7 @@ 
 			$day = '([0-9]{1,2})';
 			$year = $hour = $minute = $second = '([0-9]{2})';
 			$zone = '([A-Z]{1,5})';
-			$pcre = '/^' . $day_name . ',' . $space . $day . '-' . $month . '-' . $year . $space . $hour . ':' . $minute . ':' . $second . $space . $zone . '$/i';
+			$pcre = '/^'.$day_name.','.$space.$day.'-'.$month.'-'.$year.$space.$hour.':'.$minute.':'.$second.$space.$zone.'$/i';
 		}
 		if (preg_match($pcre, $date, $match))
 		{
@@ -928,7 +928,7 @@ 
 	public function date_asctime($date)
 	{
 		static $pcre;
-		if (!$pcre)
+		if ( ! $pcre)
 		{
 			$space = '[\x09\x20]+';
 			$wday_name = $this->day_pcre;
@@ -937,7 +937,7 @@ 
 			$hour = $sec = $min = '([0-9]{2})';
 			$year = '([0-9]{4})';
 			$terminator = '\x0A?\x00?';
-			$pcre = '/^' . $wday_name . $space . $mon_name . $space . $day . $space . $hour . ':' . $min . ':' . $sec . $space . $year . $terminator . '$/i';
+			$pcre = '/^'.$wday_name.$space.$mon_name.$space.$day.$space.$hour.':'.$min.':'.$sec.$space.$year.$terminator.'$/i';
 		}
 		if (preg_match($pcre, $date, $match))
 		{

Braces +13 added lines, -26 removed lines

@@ -620,8 +620,7 @@ 
 		if (is_callable($callback))
 		{
 			$this->user[] = $callback;
-		}
-		else
+		} else
 		{
 			trigger_error('User-supplied function must be a valid callback', E_USER_WARNING);
 		}
@@ -683,8 +682,7 @@ 
 				{
 					$timezone = 0 - $timezone;
 				}
-			}
-			else
+			} else
 			{
 				$timezone = 0;
 			}
@@ -693,8 +691,7 @@ 
 			$second = round($match[6] + $match[7] / pow(10, strlen($match[7])));
 
 			return gmmktime($match[4], $match[5], $second, $match[2], $match[3], $match[1]) - $timezone;
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -730,8 +727,7 @@ 
 					{
 						$position++;
 						continue;
-					}
-					elseif (isset($string[$position]))
+					} elseif (isset($string[$position]))
 					{
 						switch ($string[$position])
 						{
@@ -744,14 +740,12 @@ 
 								break;
 						}
 						$position++;
-					}
-					else
+					} else
 					{
 						break;
 					}
 				}
-			}
-			else
+			} else
 			{
 				$output .= '(';
 			}
@@ -830,8 +824,7 @@ 
 			if ($match[4] < 50)
 			{
 				$match[4] += 2000;
-			}
-			elseif ($match[4] < 1000)
+			} elseif ($match[4] < 1000)
 			{
 				$match[4] += 1900;
 			}
@@ -840,15 +833,13 @@ 
 			if ($match[7] !== '')
 			{
 				$second = $match[7];
-			}
-			else
+			} else
 			{
 				$second = 0;
 			}
 
 			return gmmktime($match[5], $match[6], $second, $month, $match[2], $match[4]) - $timezone;
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -905,15 +896,13 @@ 
 			if ($match[4] < 50)
 			{
 				$match[4] += 2000;
-			}
-			else
+			} else
 			{
 				$match[4] += 1900;
 			}
 
 			return gmmktime($match[5], $match[6], $match[7], $month, $match[2], $match[4]) - $timezone;
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -954,8 +943,7 @@ 
 
 			$month = $this->month[strtolower($match[2])];
 			return gmmktime($match[4], $match[5], $match[6], $month, $match[3], $match[7]);
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -973,8 +961,7 @@ 
 		if ($strtotime === -1 || $strtotime === false)
 		{
 			return false;
-		}
-		else
+		} else
 		{
 			return $strtotime;
 		}

src/wp-includes/SimplePie/Parser.php

Doc Comments +9 added lines

@@ -265,6 +265,9 @@ 
 		return $this->data;
 	}
 
+	/**
+	 * @param string $tag
+	 */
 	public function tag_open($parser, $tag, $attributes)
 	{
 		list($this->namespace[], $this->element[]) = $this->split_ns($tag);
@@ -332,6 +335,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $cdata
+	 */
 	public function cdata($parser, $cdata)
 	{
 		if ($this->current_xhtml_construct >= 0)
@@ -344,6 +350,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $tag
+	 */
 	public function tag_close($parser, $tag)
 	{
 		if ($this->current_xhtml_construct >= 0)

Spacing +15 added lines, -15 removed lines

@@ -120,7 +120,7 @@ 
 			if ($declaration->parse())
 			{
 				$data = substr($data, $pos + 2);
-				$data = '<?xml version="' . $declaration->version . '" encoding="' . $encoding . '" standalone="' . (($declaration->standalone) ? 'yes' : 'no') . '"?>' . $data;
+				$data = '<?xml version="'.$declaration->version.'" encoding="'.$encoding.'" standalone="'.(($declaration->standalone) ? 'yes' : 'no').'"?>'.$data;
 			}
 			else
 			{
@@ -151,7 +151,7 @@ 
 			xml_set_element_handler($xml, 'tag_open', 'tag_close');
 
 			// Parse!
-			if (!xml_parse($xml, $data, true))
+			if ( ! xml_parse($xml, $data, true))
 			{
 				$this->error_code = xml_get_error_code($xml);
 				$this->error_string = xml_error_string($this->error_code);
@@ -176,7 +176,7 @@ 
 					case constant('XMLReader::END_ELEMENT'):
 						if ($xml->namespaceURI !== '')
 						{
-							$tagName = $xml->namespaceURI . $this->separator . $xml->localName;
+							$tagName = $xml->namespaceURI.$this->separator.$xml->localName;
 						}
 						else
 						{
@@ -188,7 +188,7 @@ 
 						$empty = $xml->isEmptyElement;
 						if ($xml->namespaceURI !== '')
 						{
-							$tagName = $xml->namespaceURI . $this->separator . $xml->localName;
+							$tagName = $xml->namespaceURI.$this->separator.$xml->localName;
 						}
 						else
 						{
@@ -199,7 +199,7 @@ 
 						{
 							if ($xml->namespaceURI !== '')
 							{
-								$attrName = $xml->namespaceURI . $this->separator . $xml->localName;
+								$attrName = $xml->namespaceURI.$this->separator.$xml->localName;
 							}
 							else
 							{
@@ -305,12 +305,12 @@ 
 			$this->current_xhtml_construct++;
 			if (end($this->namespace) === SIMPLEPIE_NAMESPACE_XHTML)
 			{
-				$this->data['data'] .= '<' . end($this->element);
+				$this->data['data'] .= '<'.end($this->element);
 				if (isset($attribs['']))
 				{
 					foreach ($attribs[''] as $name => $value)
 					{
-						$this->data['data'] .= ' ' . $name . '="' . htmlspecialchars($value, ENT_COMPAT, $this->encoding) . '"';
+						$this->data['data'] .= ' '.$name.'="'.htmlspecialchars($value, ENT_COMPAT, $this->encoding).'"';
 					}
 				}
 				$this->data['data'] .= '>';
@@ -318,8 +318,8 @@ 
 		}
 		else
 		{
-			$this->datas[] =& $this->data;
-			$this->data =& $this->data['child'][end($this->namespace)][end($this->element)][];
+			$this->datas[] = & $this->data;
+			$this->data = & $this->data['child'][end($this->namespace)][end($this->element)][];
 			$this->data = array('data' => '', 'attribs' => $attribs, 'xml_base' => end($this->xml_base), 'xml_base_explicit' => end($this->xml_base_explicit), 'xml_lang' => end($this->xml_lang));
 			if ((end($this->namespace) === SIMPLEPIE_NAMESPACE_ATOM_03 && in_array(end($this->element), array('title', 'tagline', 'copyright', 'info', 'summary', 'content')) && isset($attribs['']['mode']) && $attribs['']['mode'] === 'xml')
 			|| (end($this->namespace) === SIMPLEPIE_NAMESPACE_ATOM_10 && in_array(end($this->element), array('rights', 'subtitle', 'summary', 'info', 'title', 'content')) && isset($attribs['']['type']) && $attribs['']['type'] === 'xhtml')
@@ -349,14 +349,14 @@ 
 		if ($this->current_xhtml_construct >= 0)
 		{
 			$this->current_xhtml_construct--;
-			if (end($this->namespace) === SIMPLEPIE_NAMESPACE_XHTML && !in_array(end($this->element), array('area', 'base', 'basefont', 'br', 'col', 'frame', 'hr', 'img', 'input', 'isindex', 'link', 'meta', 'param')))
+			if (end($this->namespace) === SIMPLEPIE_NAMESPACE_XHTML && ! in_array(end($this->element), array('area', 'base', 'basefont', 'br', 'col', 'frame', 'hr', 'img', 'input', 'isindex', 'link', 'meta', 'param')))
 			{
-				$this->data['data'] .= '</' . end($this->element) . '>';
+				$this->data['data'] .= '</'.end($this->element).'>';
 			}
 		}
 		if ($this->current_xhtml_construct === -1)
 		{
-			$this->data =& $this->datas[count($this->datas) - 1];
+			$this->data = & $this->datas[count($this->datas) - 1];
 			array_pop($this->datas);
 		}
 
@@ -370,12 +370,12 @@ 
 	public function split_ns($string)
 	{
 		static $cache = array();
-		if (!isset($cache[$string]))
+		if ( ! isset($cache[$string]))
 		{
 			if ($pos = strpos($string, $this->separator))
 			{
 				static $separator_length;
-				if (!$separator_length)
+				if ( ! $separator_length)
 				{
 					$separator_length = strlen($this->separator);
 				}
@@ -391,7 +391,7 @@ 
 					$namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG2 ||
 					$namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG3 ||
 					$namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG4 ||
-					$namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG5 )
+					$namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG5)
 				{
 					$namespace = SIMPLEPIE_NAMESPACE_MEDIARSS;
 				}

Braces +12 added lines, -24 removed lines

@@ -81,8 +81,7 @@ 
 		if (strtoupper($encoding) === 'US-ASCII')
 		{
 			$this->encoding = 'UTF-8';
-		}
-		else
+		} else
 		{
 			$this->encoding = $encoding;
 		}
@@ -121,8 +120,7 @@ 
 			{
 				$data = substr($data, $pos + 2);
 				$data = '<?xml version="' . $declaration->version . '" encoding="' . $encoding . '" standalone="' . (($declaration->standalone) ? 'yes' : 'no') . '"?>' . $data;
-			}
-			else
+			} else
 			{
 				$this->error_string = 'SimplePie bug! Please report this!';
 				return false;
@@ -162,8 +160,7 @@ 
 			$this->current_byte = xml_get_current_byte_index($xml);
 			xml_parser_free($xml);
 			return $return;
-		}
-		else
+		} else
 		{
 			libxml_clear_errors();
 			$xml = new XMLReader();
@@ -177,8 +174,7 @@ 
 						if ($xml->namespaceURI !== '')
 						{
 							$tagName = $xml->namespaceURI . $this->separator . $xml->localName;
-						}
-						else
+						} else
 						{
 							$tagName = $xml->localName;
 						}
@@ -189,8 +185,7 @@ 
 						if ($xml->namespaceURI !== '')
 						{
 							$tagName = $xml->namespaceURI . $this->separator . $xml->localName;
-						}
-						else
+						} else
 						{
 							$tagName = $xml->localName;
 						}
@@ -200,8 +195,7 @@ 
 							if ($xml->namespaceURI !== '')
 							{
 								$attrName = $xml->namespaceURI . $this->separator . $xml->localName;
-							}
-							else
+							} else
 							{
 								$attrName = $xml->localName;
 							}
@@ -227,8 +221,7 @@ 
 				$this->current_line = $error->line;
 				$this->current_column = $error->column;
 				return false;
-			}
-			else
+			} else
 			{
 				return true;
 			}
@@ -284,8 +277,7 @@ 
 				$this->xml_base[] = $base;
 				$this->xml_base_explicit[] = true;
 			}
-		}
-		else
+		} else
 		{
 			$this->xml_base[] = end($this->xml_base);
 			$this->xml_base_explicit[] = end($this->xml_base_explicit);
@@ -294,8 +286,7 @@ 
 		if (isset($attribs[SIMPLEPIE_NAMESPACE_XML]['lang']))
 		{
 			$this->xml_lang[] = $attribs[SIMPLEPIE_NAMESPACE_XML]['lang'];
-		}
-		else
+		} else
 		{
 			$this->xml_lang[] = end($this->xml_lang);
 		}
@@ -315,8 +306,7 @@ 
 				}
 				$this->data['data'] .= '>';
 			}
-		}
-		else
+		} else
 		{
 			$this->datas[] =& $this->data;
 			$this->data =& $this->data['child'][end($this->namespace)][end($this->element)][];
@@ -337,8 +327,7 @@ 
 		if ($this->current_xhtml_construct >= 0)
 		{
 			$this->data['data'] .= htmlspecialchars($cdata, ENT_QUOTES, $this->encoding);
-		}
-		else
+		} else
 		{
 			$this->data['data'] .= $cdata;
 		}
@@ -396,8 +385,7 @@ 
 					$namespace = SIMPLEPIE_NAMESPACE_MEDIARSS;
 				}
 				$cache[$string] = array($namespace, $local_name);
-			}
-			else
+			} else
 			{
 				$cache[$string] = array('', $string);
 			}

src/wp-includes/template.php

Doc Comments +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
  * @since 1.5.0
  *
  * @param string $type      Filename without extension.
- * @param array  $templates An optional list of template candidates
+ * @param string[]  $templates An optional list of template candidates
  * @return string Full path to template file.
  */
 function get_query_template( $type, $templates = array() ) {

Spacing +76 added lines, -76 removed lines

@@ -20,10 +20,10 @@ 
  * @param array  $templates An optional list of template candidates
  * @return string Full path to template file.
  */
-function get_query_template( $type, $templates = array() ) {
-	$type = preg_replace( '|[^a-z0-9-]+|', '', $type );
+function get_query_template($type, $templates = array()) {
+	$type = preg_replace('|[^a-z0-9-]+|', '', $type);
 
-	if ( empty( $templates ) )
+	if (empty($templates))
 		$templates = array("{$type}.php");
 
 	/**
@@ -38,9 +38,9 @@ 
 	 *
 	 * @param array $templates A list of template candidates, in descending order of priority.
 	 */
-	$templates = apply_filters( "{$type}_template_hierarchy", $templates );
+	$templates = apply_filters("{$type}_template_hierarchy", $templates);
 
-	$template = locate_template( $templates );
+	$template = locate_template($templates);
 
 	/**
 	 * Filters the path of the queried template by type.
@@ -56,7 +56,7 @@ 
 	 *
 	 * @param string $template Path to the template. See locate_template().
 	 */
-	return apply_filters( "{$type}_template", $template );
+	return apply_filters("{$type}_template", $template);
 }
 
 /**
@@ -104,17 +104,17 @@ 
  * @return string Full path to archive template file.
  */
 function get_archive_template() {
-	$post_types = array_filter( (array) get_query_var( 'post_type' ) );
+	$post_types = array_filter((array) get_query_var('post_type'));
 
 	$templates = array();
 
-	if ( count( $post_types ) == 1 ) {
-		$post_type = reset( $post_types );
+	if (count($post_types) == 1) {
+		$post_type = reset($post_types);
 		$templates[] = "archive-{$post_type}.php";
 	}
 	$templates[] = 'archive.php';
 
-	return get_query_template( 'archive', $templates );
+	return get_query_template('archive', $templates);
 }
 
 /**
@@ -130,12 +130,12 @@ 
  * @return string Full path to archive template file.
  */
 function get_post_type_archive_template() {
-	$post_type = get_query_var( 'post_type' );
-	if ( is_array( $post_type ) )
-		$post_type = reset( $post_type );
+	$post_type = get_query_var('post_type');
+	if (is_array($post_type))
+		$post_type = reset($post_type);
 
-	$obj = get_post_type_object( $post_type );
-	if ( ! $obj->has_archive )
+	$obj = get_post_type_object($post_type);
+	if ( ! $obj->has_archive)
 		return '';
 
 	return get_archive_template();
@@ -170,13 +170,13 @@ 
 
 	$templates = array();
 
-	if ( $author instanceof WP_User ) {
+	if ($author instanceof WP_User) {
 		$templates[] = "author-{$author->user_nicename}.php";
 		$templates[] = "author-{$author->ID}.php";
 	}
 	$templates[] = 'author.php';
 
-	return get_query_template( 'author', $templates );
+	return get_query_template('author', $templates);
 }
 
 /**
@@ -210,10 +210,10 @@ 
 
 	$templates = array();
 
-	if ( ! empty( $category->slug ) ) {
+	if ( ! empty($category->slug)) {
 
-		$slug_decoded = urldecode( $category->slug );
-		if ( $slug_decoded !== $category->slug ) {
+		$slug_decoded = urldecode($category->slug);
+		if ($slug_decoded !== $category->slug) {
 			$templates[] = "category-{$slug_decoded}.php";
 		}
 
@@ -222,7 +222,7 @@ 
 	}
 	$templates[] = 'category.php';
 
-	return get_query_template( 'category', $templates );
+	return get_query_template('category', $templates);
 }
 
 /**
@@ -256,10 +256,10 @@ 
 
 	$templates = array();
 
-	if ( ! empty( $tag->slug ) ) {
+	if ( ! empty($tag->slug)) {
 
-		$slug_decoded = urldecode( $tag->slug );
-		if ( $slug_decoded !== $tag->slug ) {
+		$slug_decoded = urldecode($tag->slug);
+		if ($slug_decoded !== $tag->slug) {
 			$templates[] = "tag-{$slug_decoded}.php";
 		}
 
@@ -268,7 +268,7 @@ 
 	}
 	$templates[] = 'tag.php';
 
-	return get_query_template( 'tag', $templates );
+	return get_query_template('tag', $templates);
 }
 
 /**
@@ -302,11 +302,11 @@ 
 
 	$templates = array();
 
-	if ( ! empty( $term->slug ) ) {
+	if ( ! empty($term->slug)) {
 		$taxonomy = $term->taxonomy;
 
-		$slug_decoded = urldecode( $term->slug );
-		if ( $slug_decoded !== $term->slug ) {
+		$slug_decoded = urldecode($term->slug);
+		if ($slug_decoded !== $term->slug) {
 			$templates[] = "taxonomy-$taxonomy-{$slug_decoded}.php";
 		}
 
@@ -315,7 +315,7 @@ 
 	}
 	$templates[] = 'taxonomy.php';
 
-	return get_query_template( 'taxonomy', $templates );
+	return get_query_template('taxonomy', $templates);
 }
 
 /**
@@ -347,9 +347,9 @@ 
  * @return string Full path to home template file.
  */
 function get_home_template() {
-	$templates = array( 'home.php', 'index.php' );
+	$templates = array('home.php', 'index.php');
 
-	return get_query_template( 'home', $templates );
+	return get_query_template('home', $templates);
 }
 
 /**
@@ -367,7 +367,7 @@ 
 function get_front_page_template() {
 	$templates = array('front-page.php');
 
-	return get_query_template( 'front_page', $templates );
+	return get_query_template('front_page', $templates);
 }
 
 /**
@@ -403,28 +403,28 @@ 
 	$template = get_page_template_slug();
 	$pagename = get_query_var('pagename');
 
-	if ( ! $pagename && $id ) {
+	if ( ! $pagename && $id) {
 		// If a static page is set as the front page, $pagename will not be set. Retrieve it from the queried object
 		$post = get_queried_object();
-		if ( $post )
+		if ($post)
 			$pagename = $post->post_name;
 	}
 
 	$templates = array();
-	if ( $template && 0 === validate_file( $template ) )
+	if ($template && 0 === validate_file($template))
 		$templates[] = $template;
-	if ( $pagename ) {
-		$pagename_decoded = urldecode( $pagename );
-		if ( $pagename_decoded !== $pagename ) {
+	if ($pagename) {
+		$pagename_decoded = urldecode($pagename);
+		if ($pagename_decoded !== $pagename) {
 			$templates[] = "page-{$pagename_decoded}.php";
 		}
 		$templates[] = "page-$pagename.php";
 	}
-	if ( $id )
+	if ($id)
 		$templates[] = "page-$id.php";
 	$templates[] = 'page.php';
 
-	return get_query_template( 'page', $templates );
+	return get_query_template('page', $templates);
 }
 
 /**
@@ -479,14 +479,14 @@ 
 
 	$templates = array();
 
-	if ( ! empty( $object->post_type ) ) {
-		$template = get_page_template_slug( $object );
-		if ( $template && 0 === validate_file( $template ) ) {
+	if ( ! empty($object->post_type)) {
+		$template = get_page_template_slug($object);
+		if ($template && 0 === validate_file($template)) {
 			$templates[] = $template;
 		}
 
-		$name_decoded = urldecode( $object->post_name );
-		if ( $name_decoded !== $object->post_name ) {
+		$name_decoded = urldecode($object->post_name);
+		if ($name_decoded !== $object->post_name) {
 			$templates[] = "single-{$object->post_type}-{$name_decoded}.php";
 		}
 
@@ -496,7 +496,7 @@ 
 
 	$templates[] = "single.php";
 
-	return get_query_template( 'single', $templates );
+	return get_query_template('single', $templates);
 }
 
 /**
@@ -528,9 +528,9 @@ 
 
 	$templates = array();
 
-	if ( ! empty( $object->post_type ) ) {
-		$post_format = get_post_format( $object );
-		if ( $post_format ) {
+	if ( ! empty($object->post_type)) {
+		$post_format = get_post_format($object);
+		if ($post_format) {
 			$templates[] = "embed-{$object->post_type}-{$post_format}.php";
 		}
 		$templates[] = "embed-{$object->post_type}.php";
@@ -538,7 +538,7 @@ 
 
 	$templates[] = "embed.php";
 
-	return get_query_template( 'embed', $templates );
+	return get_query_template('embed', $templates);
 }
 
 /**
@@ -554,7 +554,7 @@ 
  * @return string Full path to singular template file
  */
 function get_singular_template() {
-	return get_query_template( 'singular' );
+	return get_query_template('singular');
 }
 
 /**
@@ -591,14 +591,14 @@ 
 
 	$templates = array();
 
-	if ( $attachment ) {
-		if ( false !== strpos( $attachment->post_mime_type, '/' ) ) {
-			list( $type, $subtype ) = explode( '/', $attachment->post_mime_type );
+	if ($attachment) {
+		if (false !== strpos($attachment->post_mime_type, '/')) {
+			list($type, $subtype) = explode('/', $attachment->post_mime_type);
 		} else {
-			list( $type, $subtype ) = array( $attachment->post_mime_type, '' );
+			list($type, $subtype) = array($attachment->post_mime_type, '');
 		}
 
-		if ( ! empty( $subtype ) ) {
+		if ( ! empty($subtype)) {
 			$templates[] = "{$type}-{$subtype}.php";
 			$templates[] = "{$subtype}.php";
 		}
@@ -606,7 +606,7 @@ 
 	}
 	$templates[] = 'attachment.php';
 
-	return get_query_template( 'attachment', $templates );
+	return get_query_template('attachment', $templates);
 }
 
 /**
@@ -622,25 +622,25 @@ 
  * @param bool         $require_once   Whether to require_once or require. Default true. Has no effect if $load is false.
  * @return string The template filename if one is located.
  */
-function locate_template($template_names, $load = false, $require_once = true ) {
+function locate_template($template_names, $load = false, $require_once = true) {
 	$located = '';
-	foreach ( (array) $template_names as $template_name ) {
-		if ( !$template_name )
+	foreach ((array) $template_names as $template_name) {
+		if ( ! $template_name)
 			continue;
-		if ( file_exists(STYLESHEETPATH . '/' . $template_name)) {
-			$located = STYLESHEETPATH . '/' . $template_name;
+		if (file_exists(STYLESHEETPATH.'/'.$template_name)) {
+			$located = STYLESHEETPATH.'/'.$template_name;
 			break;
-		} elseif ( file_exists(TEMPLATEPATH . '/' . $template_name) ) {
-			$located = TEMPLATEPATH . '/' . $template_name;
+		} elseif (file_exists(TEMPLATEPATH.'/'.$template_name)) {
+			$located = TEMPLATEPATH.'/'.$template_name;
 			break;
-		} elseif ( file_exists( ABSPATH . WPINC . '/theme-compat/' . $template_name ) ) {
-			$located = ABSPATH . WPINC . '/theme-compat/' . $template_name;
+		} elseif (file_exists(ABSPATH.WPINC.'/theme-compat/'.$template_name)) {
+			$located = ABSPATH.WPINC.'/theme-compat/'.$template_name;
 			break;
 		}
 	}
 
-	if ( $load && '' != $located )
-		load_template( $located, $require_once );
+	if ($load && '' != $located)
+		load_template($located, $require_once);
 
 	return $located;
 }
@@ -669,20 +669,20 @@ 
  * @param string $_template_file Path to template file.
  * @param bool   $require_once   Whether to require_once or require. Default true.
  */
-function load_template( $_template_file, $require_once = true ) {
+function load_template($_template_file, $require_once = true) {
 	global $posts, $post, $wp_did_header, $wp_query, $wp_rewrite, $wpdb, $wp_version, $wp, $id, $comment, $user_ID;
 
-	if ( is_array( $wp_query->query_vars ) ) {
-		extract( $wp_query->query_vars, EXTR_SKIP );
+	if (is_array($wp_query->query_vars)) {
+		extract($wp_query->query_vars, EXTR_SKIP);
 	}
 
-	if ( isset( $s ) ) {
-		$s = esc_attr( $s );
+	if (isset($s)) {
+		$s = esc_attr($s);
 	}
 
-	if ( $require_once ) {
-		require_once( $_template_file );
+	if ($require_once) {
+		require_once($_template_file);
 	} else {
-		require( $_template_file );
+		require($_template_file);
 	}
 }

Braces +24 added lines, -16 removed lines

@@ -23,8 +23,9 @@ 
 function get_query_template( $type, $templates = array() ) {
 	$type = preg_replace( '|[^a-z0-9-]+|', '', $type );
 
-	if ( empty( $templates ) )
-		$templates = array("{$type}.php");
+	if ( empty( $templates ) ) {
+			$templates = array("{$type}.php");
+	}
 
 	/**
 	 * Filters the list of template filenames that are searched for when retrieving a template to use.
@@ -131,12 +132,14 @@ 
  */
 function get_post_type_archive_template() {
 	$post_type = get_query_var( 'post_type' );
-	if ( is_array( $post_type ) )
-		$post_type = reset( $post_type );
+	if ( is_array( $post_type ) ) {
+			$post_type = reset( $post_type );
+	}
 
 	$obj = get_post_type_object( $post_type );
-	if ( ! $obj->has_archive )
-		return '';
+	if ( ! $obj->has_archive ) {
+			return '';
+	}
 
 	return get_archive_template();
 }
@@ -406,13 +409,15 @@ 
 	if ( ! $pagename && $id ) {
 		// If a static page is set as the front page, $pagename will not be set. Retrieve it from the queried object
 		$post = get_queried_object();
-		if ( $post )
-			$pagename = $post->post_name;
+		if ( $post ) {
+					$pagename = $post->post_name;
+		}
 	}
 
 	$templates = array();
-	if ( $template && 0 === validate_file( $template ) )
-		$templates[] = $template;
+	if ( $template && 0 === validate_file( $template ) ) {
+			$templates[] = $template;
+	}
 	if ( $pagename ) {
 		$pagename_decoded = urldecode( $pagename );
 		if ( $pagename_decoded !== $pagename ) {
@@ -420,8 +425,9 @@ 
 		}
 		$templates[] = "page-$pagename.php";
 	}
-	if ( $id )
-		$templates[] = "page-$id.php";
+	if ( $id ) {
+			$templates[] = "page-$id.php";
+	}
 	$templates[] = 'page.php';
 
 	return get_query_template( 'page', $templates );
@@ -625,8 +631,9 @@ 
 function locate_template($template_names, $load = false, $require_once = true ) {
 	$located = '';
 	foreach ( (array) $template_names as $template_name ) {
-		if ( !$template_name )
-			continue;
+		if ( !$template_name ) {
+					continue;
+		}
 		if ( file_exists(STYLESHEETPATH . '/' . $template_name)) {
 			$located = STYLESHEETPATH . '/' . $template_name;
 			break;
@@ -639,8 +646,9 @@ 
 		}
 	}
 
-	if ( $load && '' != $located )
-		load_template( $located, $require_once );
+	if ( $load && '' != $located ) {
+			load_template( $located, $require_once );
+	}
 
 	return $located;
 }

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

Doc Comments +5 added lines

@@ -145,6 +145,7 @@ 
      * the two files do not match, and likewise that the last lines do not
      * match.  The caller must trim matching lines from the beginning and end
      * of the portions it is going to specify.
+     * @param double $nchunks
      */
     function _diag ($xoff, $xlim, $yoff, $ylim, $nchunks)
     {
@@ -265,6 +266,10 @@ 
      *
      * Note that XLIM, YLIM are exclusive bounds.  All line numbers are
      * origin-0 and discarded lines are not counted.
+     * @param integer $xoff
+     * @param integer $xlim
+     * @param integer $yoff
+     * @param integer $ylim
      */
     function _compareseq ($xoff, $xlim, $yoff, $ylim)
     {

Spacing +8 added lines, -8 removed lines

@@ -99,7 +99,7 @@ 
             // Skip matching "snake".
             $copy = array();
             while ($xi < $n_from && $yi < $n_to
-                   && !$this->xchanged[$xi] && !$this->ychanged[$yi]) {
+                   && ! $this->xchanged[$xi] && ! $this->ychanged[$yi]) {
                 $copy[] = $from_lines[$xi++];
                 ++$yi;
             }
@@ -146,7 +146,7 @@ 
      * match.  The caller must trim matching lines from the beginning and end
      * of the portions it is going to specify.
      */
-    function _diag ($xoff, $xlim, $yoff, $ylim, $nchunks)
+    function _diag($xoff, $xlim, $yoff, $ylim, $nchunks)
     {
         $flip = false;
 
@@ -169,7 +169,7 @@ 
         }
 
         $this->lcs = 0;
-        $this->seq[0]= $yoff - 1;
+        $this->seq[0] = $yoff - 1;
         $this->in_seq = array();
         $ymids[0] = array();
 
@@ -182,7 +182,7 @@ 
                 }
             }
 
-            $x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $chunk) / $nchunks);
+            $x1 = $xoff + (int) (($numer + ($xlim - $xoff) * $chunk) / $nchunks);
             for (; $x < $x1; $x++) {
                 $line = $flip ? $this->yv[$x] : $this->xv[$x];
                 if (empty($ymatches[$line])) {
@@ -218,7 +218,7 @@ 
         $seps[] = $flip ? array($yoff, $xoff) : array($xoff, $yoff);
         $ymid = $ymids[$this->lcs];
         for ($n = 0; $n < $nchunks - 1; $n++) {
-            $x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $n) / $nchunks);
+            $x1 = $xoff + (int) (($numer + ($xlim - $xoff) * $n) / $nchunks);
             $y1 = $ymid[$n] + 1;
             $seps[] = $flip ? array($y1, $x1) : array($x1, $y1);
         }
@@ -238,7 +238,7 @@ 
 
         $beg = 1;
         while ($beg < $end) {
-            $mid = (int)(($beg + $end) / 2);
+            $mid = (int) (($beg + $end) / 2);
             if ($ypos > $this->seq[$mid]) {
                 $beg = $mid + 1;
             } else {
@@ -266,7 +266,7 @@ 
      * Note that XLIM, YLIM are exclusive bounds.  All line numbers are
      * origin-0 and discarded lines are not counted.
      */
-    function _compareseq ($xoff, $xlim, $yoff, $ylim)
+    function _compareseq($xoff, $xlim, $yoff, $ylim)
     {
         /* Slide down the bottom initial diagonal. */
         while ($xoff < $xlim && $yoff < $ylim
@@ -307,7 +307,7 @@ 
             reset($seps);
             $pt1 = $seps[0];
             while ($pt2 = next($seps)) {
-                $this->_compareseq ($pt1[0], $pt2[0], $pt1[1], $pt2[1]);
+                $this->_compareseq($pt1[0], $pt2[0], $pt1[1], $pt2[1]);
                 $pt1 = $pt2;
             }
         }

Indentation +375 added lines, -375 removed lines

@@ -28,314 +28,314 @@ 
  */
 class Text_Diff_Engine_native {
 
-    function diff($from_lines, $to_lines)
-    {
-        array_walk($from_lines, array('Text_Diff', 'trimNewlines'));
-        array_walk($to_lines, array('Text_Diff', 'trimNewlines'));
-
-        $n_from = count($from_lines);
-        $n_to = count($to_lines);
-
-        $this->xchanged = $this->ychanged = array();
-        $this->xv = $this->yv = array();
-        $this->xind = $this->yind = array();
-        unset($this->seq);
-        unset($this->in_seq);
-        unset($this->lcs);
-
-        // Skip leading common lines.
-        for ($skip = 0; $skip < $n_from && $skip < $n_to; $skip++) {
-            if ($from_lines[$skip] !== $to_lines[$skip]) {
-                break;
-            }
-            $this->xchanged[$skip] = $this->ychanged[$skip] = false;
-        }
-
-        // Skip trailing common lines.
-        $xi = $n_from; $yi = $n_to;
-        for ($endskip = 0; --$xi > $skip && --$yi > $skip; $endskip++) {
-            if ($from_lines[$xi] !== $to_lines[$yi]) {
-                break;
-            }
-            $this->xchanged[$xi] = $this->ychanged[$yi] = false;
-        }
-
-        // Ignore lines which do not exist in both files.
-        for ($xi = $skip; $xi < $n_from - $endskip; $xi++) {
-            $xhash[$from_lines[$xi]] = 1;
-        }
-        for ($yi = $skip; $yi < $n_to - $endskip; $yi++) {
-            $line = $to_lines[$yi];
-            if (($this->ychanged[$yi] = empty($xhash[$line]))) {
-                continue;
-            }
-            $yhash[$line] = 1;
-            $this->yv[] = $line;
-            $this->yind[] = $yi;
-        }
-        for ($xi = $skip; $xi < $n_from - $endskip; $xi++) {
-            $line = $from_lines[$xi];
-            if (($this->xchanged[$xi] = empty($yhash[$line]))) {
-                continue;
-            }
-            $this->xv[] = $line;
-            $this->xind[] = $xi;
-        }
-
-        // Find the LCS.
-        $this->_compareseq(0, count($this->xv), 0, count($this->yv));
-
-        // Merge edits when possible.
-        $this->_shiftBoundaries($from_lines, $this->xchanged, $this->ychanged);
-        $this->_shiftBoundaries($to_lines, $this->ychanged, $this->xchanged);
-
-        // Compute the edit operations.
-        $edits = array();
-        $xi = $yi = 0;
-        while ($xi < $n_from || $yi < $n_to) {
-            assert($yi < $n_to || $this->xchanged[$xi]);
-            assert($xi < $n_from || $this->ychanged[$yi]);
-
-            // Skip matching "snake".
-            $copy = array();
-            while ($xi < $n_from && $yi < $n_to
-                   && !$this->xchanged[$xi] && !$this->ychanged[$yi]) {
-                $copy[] = $from_lines[$xi++];
-                ++$yi;
-            }
-            if ($copy) {
-                $edits[] = new Text_Diff_Op_copy($copy);
-            }
-
-            // Find deletes & adds.
-            $delete = array();
-            while ($xi < $n_from && $this->xchanged[$xi]) {
-                $delete[] = $from_lines[$xi++];
-            }
-
-            $add = array();
-            while ($yi < $n_to && $this->ychanged[$yi]) {
-                $add[] = $to_lines[$yi++];
-            }
-
-            if ($delete && $add) {
-                $edits[] = new Text_Diff_Op_change($delete, $add);
-            } elseif ($delete) {
-                $edits[] = new Text_Diff_Op_delete($delete);
-            } elseif ($add) {
-                $edits[] = new Text_Diff_Op_add($add);
-            }
-        }
-
-        return $edits;
-    }
-
-    /**
-     * Divides the Largest Common Subsequence (LCS) of the sequences (XOFF,
-     * XLIM) and (YOFF, YLIM) into NCHUNKS approximately equally sized
-     * segments.
-     *
-     * Returns (LCS, PTS).  LCS is the length of the LCS. PTS is an array of
-     * NCHUNKS+1 (X, Y) indexes giving the diving points between sub
-     * sequences.  The first sub-sequence is contained in (X0, X1), (Y0, Y1),
-     * the second in (X1, X2), (Y1, Y2) and so on.  Note that (X0, Y0) ==
-     * (XOFF, YOFF) and (X[NCHUNKS], Y[NCHUNKS]) == (XLIM, YLIM).
-     *
-     * This function assumes that the first lines of the specified portions of
-     * the two files do not match, and likewise that the last lines do not
-     * match.  The caller must trim matching lines from the beginning and end
-     * of the portions it is going to specify.
-     */
-    function _diag ($xoff, $xlim, $yoff, $ylim, $nchunks)
-    {
-        $flip = false;
-
-        if ($xlim - $xoff > $ylim - $yoff) {
-            /* Things seems faster (I'm not sure I understand why) when the
+	function diff($from_lines, $to_lines)
+	{
+		array_walk($from_lines, array('Text_Diff', 'trimNewlines'));
+		array_walk($to_lines, array('Text_Diff', 'trimNewlines'));
+
+		$n_from = count($from_lines);
+		$n_to = count($to_lines);
+
+		$this->xchanged = $this->ychanged = array();
+		$this->xv = $this->yv = array();
+		$this->xind = $this->yind = array();
+		unset($this->seq);
+		unset($this->in_seq);
+		unset($this->lcs);
+
+		// Skip leading common lines.
+		for ($skip = 0; $skip < $n_from && $skip < $n_to; $skip++) {
+			if ($from_lines[$skip] !== $to_lines[$skip]) {
+				break;
+			}
+			$this->xchanged[$skip] = $this->ychanged[$skip] = false;
+		}
+
+		// Skip trailing common lines.
+		$xi = $n_from; $yi = $n_to;
+		for ($endskip = 0; --$xi > $skip && --$yi > $skip; $endskip++) {
+			if ($from_lines[$xi] !== $to_lines[$yi]) {
+				break;
+			}
+			$this->xchanged[$xi] = $this->ychanged[$yi] = false;
+		}
+
+		// Ignore lines which do not exist in both files.
+		for ($xi = $skip; $xi < $n_from - $endskip; $xi++) {
+			$xhash[$from_lines[$xi]] = 1;
+		}
+		for ($yi = $skip; $yi < $n_to - $endskip; $yi++) {
+			$line = $to_lines[$yi];
+			if (($this->ychanged[$yi] = empty($xhash[$line]))) {
+				continue;
+			}
+			$yhash[$line] = 1;
+			$this->yv[] = $line;
+			$this->yind[] = $yi;
+		}
+		for ($xi = $skip; $xi < $n_from - $endskip; $xi++) {
+			$line = $from_lines[$xi];
+			if (($this->xchanged[$xi] = empty($yhash[$line]))) {
+				continue;
+			}
+			$this->xv[] = $line;
+			$this->xind[] = $xi;
+		}
+
+		// Find the LCS.
+		$this->_compareseq(0, count($this->xv), 0, count($this->yv));
+
+		// Merge edits when possible.
+		$this->_shiftBoundaries($from_lines, $this->xchanged, $this->ychanged);
+		$this->_shiftBoundaries($to_lines, $this->ychanged, $this->xchanged);
+
+		// Compute the edit operations.
+		$edits = array();
+		$xi = $yi = 0;
+		while ($xi < $n_from || $yi < $n_to) {
+			assert($yi < $n_to || $this->xchanged[$xi]);
+			assert($xi < $n_from || $this->ychanged[$yi]);
+
+			// Skip matching "snake".
+			$copy = array();
+			while ($xi < $n_from && $yi < $n_to
+				   && !$this->xchanged[$xi] && !$this->ychanged[$yi]) {
+				$copy[] = $from_lines[$xi++];
+				++$yi;
+			}
+			if ($copy) {
+				$edits[] = new Text_Diff_Op_copy($copy);
+			}
+
+			// Find deletes & adds.
+			$delete = array();
+			while ($xi < $n_from && $this->xchanged[$xi]) {
+				$delete[] = $from_lines[$xi++];
+			}
+
+			$add = array();
+			while ($yi < $n_to && $this->ychanged[$yi]) {
+				$add[] = $to_lines[$yi++];
+			}
+
+			if ($delete && $add) {
+				$edits[] = new Text_Diff_Op_change($delete, $add);
+			} elseif ($delete) {
+				$edits[] = new Text_Diff_Op_delete($delete);
+			} elseif ($add) {
+				$edits[] = new Text_Diff_Op_add($add);
+			}
+		}
+
+		return $edits;
+	}
+
+	/**
+	 * Divides the Largest Common Subsequence (LCS) of the sequences (XOFF,
+	 * XLIM) and (YOFF, YLIM) into NCHUNKS approximately equally sized
+	 * segments.
+	 *
+	 * Returns (LCS, PTS).  LCS is the length of the LCS. PTS is an array of
+	 * NCHUNKS+1 (X, Y) indexes giving the diving points between sub
+	 * sequences.  The first sub-sequence is contained in (X0, X1), (Y0, Y1),
+	 * the second in (X1, X2), (Y1, Y2) and so on.  Note that (X0, Y0) ==
+	 * (XOFF, YOFF) and (X[NCHUNKS], Y[NCHUNKS]) == (XLIM, YLIM).
+	 *
+	 * This function assumes that the first lines of the specified portions of
+	 * the two files do not match, and likewise that the last lines do not
+	 * match.  The caller must trim matching lines from the beginning and end
+	 * of the portions it is going to specify.
+	 */
+	function _diag ($xoff, $xlim, $yoff, $ylim, $nchunks)
+	{
+		$flip = false;
+
+		if ($xlim - $xoff > $ylim - $yoff) {
+			/* Things seems faster (I'm not sure I understand why) when the
              * shortest sequence is in X. */
-            $flip = true;
-            list ($xoff, $xlim, $yoff, $ylim)
-                = array($yoff, $ylim, $xoff, $xlim);
-        }
-
-        if ($flip) {
-            for ($i = $ylim - 1; $i >= $yoff; $i--) {
-                $ymatches[$this->xv[$i]][] = $i;
-            }
-        } else {
-            for ($i = $ylim - 1; $i >= $yoff; $i--) {
-                $ymatches[$this->yv[$i]][] = $i;
-            }
-        }
-
-        $this->lcs = 0;
-        $this->seq[0]= $yoff - 1;
-        $this->in_seq = array();
-        $ymids[0] = array();
-
-        $numer = $xlim - $xoff + $nchunks - 1;
-        $x = $xoff;
-        for ($chunk = 0; $chunk < $nchunks; $chunk++) {
-            if ($chunk > 0) {
-                for ($i = 0; $i <= $this->lcs; $i++) {
-                    $ymids[$i][$chunk - 1] = $this->seq[$i];
-                }
-            }
-
-            $x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $chunk) / $nchunks);
-            for (; $x < $x1; $x++) {
-                $line = $flip ? $this->yv[$x] : $this->xv[$x];
-                if (empty($ymatches[$line])) {
-                    continue;
-                }
-                $matches = $ymatches[$line];
-                reset($matches);
-                while (list(, $y) = each($matches)) {
-                    if (empty($this->in_seq[$y])) {
-                        $k = $this->_lcsPos($y);
-                        assert($k > 0);
-                        $ymids[$k] = $ymids[$k - 1];
-                        break;
-                    }
-                }
-                while (list(, $y) = each($matches)) {
-                    if ($y > $this->seq[$k - 1]) {
-                        assert($y <= $this->seq[$k]);
-                        /* Optimization: this is a common case: next match is
+			$flip = true;
+			list ($xoff, $xlim, $yoff, $ylim)
+				= array($yoff, $ylim, $xoff, $xlim);
+		}
+
+		if ($flip) {
+			for ($i = $ylim - 1; $i >= $yoff; $i--) {
+				$ymatches[$this->xv[$i]][] = $i;
+			}
+		} else {
+			for ($i = $ylim - 1; $i >= $yoff; $i--) {
+				$ymatches[$this->yv[$i]][] = $i;
+			}
+		}
+
+		$this->lcs = 0;
+		$this->seq[0]= $yoff - 1;
+		$this->in_seq = array();
+		$ymids[0] = array();
+
+		$numer = $xlim - $xoff + $nchunks - 1;
+		$x = $xoff;
+		for ($chunk = 0; $chunk < $nchunks; $chunk++) {
+			if ($chunk > 0) {
+				for ($i = 0; $i <= $this->lcs; $i++) {
+					$ymids[$i][$chunk - 1] = $this->seq[$i];
+				}
+			}
+
+			$x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $chunk) / $nchunks);
+			for (; $x < $x1; $x++) {
+				$line = $flip ? $this->yv[$x] : $this->xv[$x];
+				if (empty($ymatches[$line])) {
+					continue;
+				}
+				$matches = $ymatches[$line];
+				reset($matches);
+				while (list(, $y) = each($matches)) {
+					if (empty($this->in_seq[$y])) {
+						$k = $this->_lcsPos($y);
+						assert($k > 0);
+						$ymids[$k] = $ymids[$k - 1];
+						break;
+					}
+				}
+				while (list(, $y) = each($matches)) {
+					if ($y > $this->seq[$k - 1]) {
+						assert($y <= $this->seq[$k]);
+						/* Optimization: this is a common case: next match is
                          * just replacing previous match. */
-                        $this->in_seq[$this->seq[$k]] = false;
-                        $this->seq[$k] = $y;
-                        $this->in_seq[$y] = 1;
-                    } elseif (empty($this->in_seq[$y])) {
-                        $k = $this->_lcsPos($y);
-                        assert($k > 0);
-                        $ymids[$k] = $ymids[$k - 1];
-                    }
-                }
-            }
-        }
-
-        $seps[] = $flip ? array($yoff, $xoff) : array($xoff, $yoff);
-        $ymid = $ymids[$this->lcs];
-        for ($n = 0; $n < $nchunks - 1; $n++) {
-            $x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $n) / $nchunks);
-            $y1 = $ymid[$n] + 1;
-            $seps[] = $flip ? array($y1, $x1) : array($x1, $y1);
-        }
-        $seps[] = $flip ? array($ylim, $xlim) : array($xlim, $ylim);
-
-        return array($this->lcs, $seps);
-    }
-
-    function _lcsPos($ypos)
-    {
-        $end = $this->lcs;
-        if ($end == 0 || $ypos > $this->seq[$end]) {
-            $this->seq[++$this->lcs] = $ypos;
-            $this->in_seq[$ypos] = 1;
-            return $this->lcs;
-        }
-
-        $beg = 1;
-        while ($beg < $end) {
-            $mid = (int)(($beg + $end) / 2);
-            if ($ypos > $this->seq[$mid]) {
-                $beg = $mid + 1;
-            } else {
-                $end = $mid;
-            }
-        }
-
-        assert($ypos != $this->seq[$end]);
-
-        $this->in_seq[$this->seq[$end]] = false;
-        $this->seq[$end] = $ypos;
-        $this->in_seq[$ypos] = 1;
-        return $end;
-    }
-
-    /**
-     * Finds LCS of two sequences.
-     *
-     * The results are recorded in the vectors $this->{x,y}changed[], by
-     * storing a 1 in the element for each line that is an insertion or
-     * deletion (ie. is not in the LCS).
-     *
-     * The subsequence of file 0 is (XOFF, XLIM) and likewise for file 1.
-     *
-     * Note that XLIM, YLIM are exclusive bounds.  All line numbers are
-     * origin-0 and discarded lines are not counted.
-     */
-    function _compareseq ($xoff, $xlim, $yoff, $ylim)
-    {
-        /* Slide down the bottom initial diagonal. */
-        while ($xoff < $xlim && $yoff < $ylim
-               && $this->xv[$xoff] == $this->yv[$yoff]) {
-            ++$xoff;
-            ++$yoff;
-        }
-
-        /* Slide up the top initial diagonal. */
-        while ($xlim > $xoff && $ylim > $yoff
-               && $this->xv[$xlim - 1] == $this->yv[$ylim - 1]) {
-            --$xlim;
-            --$ylim;
-        }
-
-        if ($xoff == $xlim || $yoff == $ylim) {
-            $lcs = 0;
-        } else {
-            /* This is ad hoc but seems to work well.  $nchunks =
+						$this->in_seq[$this->seq[$k]] = false;
+						$this->seq[$k] = $y;
+						$this->in_seq[$y] = 1;
+					} elseif (empty($this->in_seq[$y])) {
+						$k = $this->_lcsPos($y);
+						assert($k > 0);
+						$ymids[$k] = $ymids[$k - 1];
+					}
+				}
+			}
+		}
+
+		$seps[] = $flip ? array($yoff, $xoff) : array($xoff, $yoff);
+		$ymid = $ymids[$this->lcs];
+		for ($n = 0; $n < $nchunks - 1; $n++) {
+			$x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $n) / $nchunks);
+			$y1 = $ymid[$n] + 1;
+			$seps[] = $flip ? array($y1, $x1) : array($x1, $y1);
+		}
+		$seps[] = $flip ? array($ylim, $xlim) : array($xlim, $ylim);
+
+		return array($this->lcs, $seps);
+	}
+
+	function _lcsPos($ypos)
+	{
+		$end = $this->lcs;
+		if ($end == 0 || $ypos > $this->seq[$end]) {
+			$this->seq[++$this->lcs] = $ypos;
+			$this->in_seq[$ypos] = 1;
+			return $this->lcs;
+		}
+
+		$beg = 1;
+		while ($beg < $end) {
+			$mid = (int)(($beg + $end) / 2);
+			if ($ypos > $this->seq[$mid]) {
+				$beg = $mid + 1;
+			} else {
+				$end = $mid;
+			}
+		}
+
+		assert($ypos != $this->seq[$end]);
+
+		$this->in_seq[$this->seq[$end]] = false;
+		$this->seq[$end] = $ypos;
+		$this->in_seq[$ypos] = 1;
+		return $end;
+	}
+
+	/**
+	 * Finds LCS of two sequences.
+	 *
+	 * The results are recorded in the vectors $this->{x,y}changed[], by
+	 * storing a 1 in the element for each line that is an insertion or
+	 * deletion (ie. is not in the LCS).
+	 *
+	 * The subsequence of file 0 is (XOFF, XLIM) and likewise for file 1.
+	 *
+	 * Note that XLIM, YLIM are exclusive bounds.  All line numbers are
+	 * origin-0 and discarded lines are not counted.
+	 */
+	function _compareseq ($xoff, $xlim, $yoff, $ylim)
+	{
+		/* Slide down the bottom initial diagonal. */
+		while ($xoff < $xlim && $yoff < $ylim
+			   && $this->xv[$xoff] == $this->yv[$yoff]) {
+			++$xoff;
+			++$yoff;
+		}
+
+		/* Slide up the top initial diagonal. */
+		while ($xlim > $xoff && $ylim > $yoff
+			   && $this->xv[$xlim - 1] == $this->yv[$ylim - 1]) {
+			--$xlim;
+			--$ylim;
+		}
+
+		if ($xoff == $xlim || $yoff == $ylim) {
+			$lcs = 0;
+		} else {
+			/* This is ad hoc but seems to work well.  $nchunks =
              * sqrt(min($xlim - $xoff, $ylim - $yoff) / 2.5); $nchunks =
              * max(2,min(8,(int)$nchunks)); */
-            $nchunks = min(7, $xlim - $xoff, $ylim - $yoff) + 1;
-            list($lcs, $seps)
-                = $this->_diag($xoff, $xlim, $yoff, $ylim, $nchunks);
-        }
+			$nchunks = min(7, $xlim - $xoff, $ylim - $yoff) + 1;
+			list($lcs, $seps)
+				= $this->_diag($xoff, $xlim, $yoff, $ylim, $nchunks);
+		}
 
-        if ($lcs == 0) {
-            /* X and Y sequences have no common subsequence: mark all
+		if ($lcs == 0) {
+			/* X and Y sequences have no common subsequence: mark all
              * changed. */
-            while ($yoff < $ylim) {
-                $this->ychanged[$this->yind[$yoff++]] = 1;
-            }
-            while ($xoff < $xlim) {
-                $this->xchanged[$this->xind[$xoff++]] = 1;
-            }
-        } else {
-            /* Use the partitions to split this problem into subproblems. */
-            reset($seps);
-            $pt1 = $seps[0];
-            while ($pt2 = next($seps)) {
-                $this->_compareseq ($pt1[0], $pt2[0], $pt1[1], $pt2[1]);
-                $pt1 = $pt2;
-            }
-        }
-    }
-
-    /**
-     * Adjusts inserts/deletes of identical lines to join changes as much as
-     * possible.
-     *
-     * We do something when a run of changed lines include a line at one end
-     * and has an excluded, identical line at the other.  We are free to
-     * choose which identical line is included.  `compareseq' usually chooses
-     * the one at the beginning, but usually it is cleaner to consider the
-     * following identical line to be the "change".
-     *
-     * This is extracted verbatim from analyze.c (GNU diffutils-2.7).
-     */
-    function _shiftBoundaries($lines, &$changed, $other_changed)
-    {
-        $i = 0;
-        $j = 0;
-
-        assert('count($lines) == count($changed)');
-        $len = count($lines);
-        $other_len = count($other_changed);
-
-        while (1) {
-            /* Scan forward to find the beginning of another run of
+			while ($yoff < $ylim) {
+				$this->ychanged[$this->yind[$yoff++]] = 1;
+			}
+			while ($xoff < $xlim) {
+				$this->xchanged[$this->xind[$xoff++]] = 1;
+			}
+		} else {
+			/* Use the partitions to split this problem into subproblems. */
+			reset($seps);
+			$pt1 = $seps[0];
+			while ($pt2 = next($seps)) {
+				$this->_compareseq ($pt1[0], $pt2[0], $pt1[1], $pt2[1]);
+				$pt1 = $pt2;
+			}
+		}
+	}
+
+	/**
+	 * Adjusts inserts/deletes of identical lines to join changes as much as
+	 * possible.
+	 *
+	 * We do something when a run of changed lines include a line at one end
+	 * and has an excluded, identical line at the other.  We are free to
+	 * choose which identical line is included.  `compareseq' usually chooses
+	 * the one at the beginning, but usually it is cleaner to consider the
+	 * following identical line to be the "change".
+	 *
+	 * This is extracted verbatim from analyze.c (GNU diffutils-2.7).
+	 */
+	function _shiftBoundaries($lines, &$changed, $other_changed)
+	{
+		$i = 0;
+		$j = 0;
+
+		assert('count($lines) == count($changed)');
+		$len = count($lines);
+		$other_len = count($other_changed);
+
+		while (1) {
+			/* Scan forward to find the beginning of another run of
              * changes. Also keep track of the corresponding point in the
              * other file.
              *
@@ -346,91 +346,91 @@ 
              *
              * Furthermore, $j is always kept so that $j == $other_len or
              * $other_changed[$j] == false. */
-            while ($j < $other_len && $other_changed[$j]) {
-                $j++;
-            }
-
-            while ($i < $len && ! $changed[$i]) {
-                assert('$j < $other_len && ! $other_changed[$j]');
-                $i++; $j++;
-                while ($j < $other_len && $other_changed[$j]) {
-                    $j++;
-                }
-            }
-
-            if ($i == $len) {
-                break;
-            }
-
-            $start = $i;
-
-            /* Find the end of this run of changes. */
-            while (++$i < $len && $changed[$i]) {
-                continue;
-            }
-
-            do {
-                /* Record the length of this run of changes, so that we can
+			while ($j < $other_len && $other_changed[$j]) {
+				$j++;
+			}
+
+			while ($i < $len && ! $changed[$i]) {
+				assert('$j < $other_len && ! $other_changed[$j]');
+				$i++; $j++;
+				while ($j < $other_len && $other_changed[$j]) {
+					$j++;
+				}
+			}
+
+			if ($i == $len) {
+				break;
+			}
+
+			$start = $i;
+
+			/* Find the end of this run of changes. */
+			while (++$i < $len && $changed[$i]) {
+				continue;
+			}
+
+			do {
+				/* Record the length of this run of changes, so that we can
                  * later determine whether the run has grown. */
-                $runlength = $i - $start;
+				$runlength = $i - $start;
 
-                /* Move the changed region back, so long as the previous
+				/* Move the changed region back, so long as the previous
                  * unchanged line matches the last changed one.  This merges
                  * with previous changed regions. */
-                while ($start > 0 && $lines[$start - 1] == $lines[$i - 1]) {
-                    $changed[--$start] = 1;
-                    $changed[--$i] = false;
-                    while ($start > 0 && $changed[$start - 1]) {
-                        $start--;
-                    }
-                    assert('$j > 0');
-                    while ($other_changed[--$j]) {
-                        continue;
-                    }
-                    assert('$j >= 0 && !$other_changed[$j]');
-                }
-
-                /* Set CORRESPONDING to the end of the changed run, at the
+				while ($start > 0 && $lines[$start - 1] == $lines[$i - 1]) {
+					$changed[--$start] = 1;
+					$changed[--$i] = false;
+					while ($start > 0 && $changed[$start - 1]) {
+						$start--;
+					}
+					assert('$j > 0');
+					while ($other_changed[--$j]) {
+						continue;
+					}
+					assert('$j >= 0 && !$other_changed[$j]');
+				}
+
+				/* Set CORRESPONDING to the end of the changed run, at the
                  * last point where it corresponds to a changed run in the
                  * other file. CORRESPONDING == LEN means no such point has
                  * been found. */
-                $corresponding = $j < $other_len ? $i : $len;
+				$corresponding = $j < $other_len ? $i : $len;
 
-                /* Move the changed region forward, so long as the first
+				/* Move the changed region forward, so long as the first
                  * changed line matches the following unchanged one.  This
                  * merges with following changed regions.  Do this second, so
                  * that if there are no merges, the changed region is moved
                  * forward as far as possible. */
-                while ($i < $len && $lines[$start] == $lines[$i]) {
-                    $changed[$start++] = false;
-                    $changed[$i++] = 1;
-                    while ($i < $len && $changed[$i]) {
-                        $i++;
-                    }
-
-                    assert('$j < $other_len && ! $other_changed[$j]');
-                    $j++;
-                    if ($j < $other_len && $other_changed[$j]) {
-                        $corresponding = $i;
-                        while ($j < $other_len && $other_changed[$j]) {
-                            $j++;
-                        }
-                    }
-                }
-            } while ($runlength != $i - $start);
-
-            /* If possible, move the fully-merged run of changes back to a
+				while ($i < $len && $lines[$start] == $lines[$i]) {
+					$changed[$start++] = false;
+					$changed[$i++] = 1;
+					while ($i < $len && $changed[$i]) {
+						$i++;
+					}
+
+					assert('$j < $other_len && ! $other_changed[$j]');
+					$j++;
+					if ($j < $other_len && $other_changed[$j]) {
+						$corresponding = $i;
+						while ($j < $other_len && $other_changed[$j]) {
+							$j++;
+						}
+					}
+				}
+			} while ($runlength != $i - $start);
+
+			/* If possible, move the fully-merged run of changes back to a
              * corresponding run in the other file. */
-            while ($corresponding < $i) {
-                $changed[--$start] = 1;
-                $changed[--$i] = 0;
-                assert('$j > 0');
-                while ($other_changed[--$j]) {
-                    continue;
-                }
-                assert('$j >= 0 && !$other_changed[$j]');
-            }
-        }
-    }
+			while ($corresponding < $i) {
+				$changed[--$start] = 1;
+				$changed[--$i] = 0;
+				assert('$j > 0');
+				while ($other_changed[--$j]) {
+					continue;
+				}
+				assert('$j >= 0 && !$other_changed[$j]');
+			}
+		}
+	}
 
 }

src/wp-includes/Text/Diff/Renderer.php

Doc Comments +9 added lines

@@ -148,6 +148,12 @@ 
         return $output . $this->_endDiff();
     }
 
+    /**
+     * @param integer $xbeg
+     * @param integer $xlen
+     * @param integer $ybeg
+     * @param integer $ylen
+     */
     function _block($xbeg, $xlen, $ybeg, $ylen, &$edits)
     {
         $output = $this->_startBlock($this->_blockHeader($xbeg, $xlen, $ybeg, $ylen));
@@ -204,6 +210,9 @@ 
         return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg;
     }
 
+    /**
+     * @param string $header
+     */
     function _startBlock($header)
     {
         return $header . "\n";

Indentation +211 added lines, -211 removed lines

@@ -14,34 +14,34 @@ 
  */
 class Text_Diff_Renderer {
 
-    /**
-     * Number of leading context "lines" to preserve.
-     *
-     * This should be left at zero for this class, but subclasses may want to
-     * set this to other values.
-     */
-    var $_leading_context_lines = 0;
-
-    /**
-     * Number of trailing context "lines" to preserve.
-     *
-     * This should be left at zero for this class, but subclasses may want to
-     * set this to other values.
-     */
-    var $_trailing_context_lines = 0;
-
-    /**
-     * Constructor.
-     */
-    function __construct( $params = array() )
-    {
-        foreach ($params as $param => $value) {
-            $v = '_' . $param;
-            if (isset($this->$v)) {
-                $this->$v = $value;
-            }
-        }
-    }
+	/**
+	 * Number of leading context "lines" to preserve.
+	 *
+	 * This should be left at zero for this class, but subclasses may want to
+	 * set this to other values.
+	 */
+	var $_leading_context_lines = 0;
+
+	/**
+	 * Number of trailing context "lines" to preserve.
+	 *
+	 * This should be left at zero for this class, but subclasses may want to
+	 * set this to other values.
+	 */
+	var $_trailing_context_lines = 0;
+
+	/**
+	 * Constructor.
+	 */
+	function __construct( $params = array() )
+	{
+		foreach ($params as $param => $value) {
+			$v = '_' . $param;
+			if (isset($this->$v)) {
+				$this->$v = $value;
+			}
+		}
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -50,193 +50,193 @@ 
 		self::__construct( $params );
 	}
 
-    /**
-     * Get any renderer parameters.
-     *
-     * @return array  All parameters of this renderer object.
-     */
-    function getParams()
-    {
-        $params = array();
-        foreach (get_object_vars($this) as $k => $v) {
-            if ($k[0] == '_') {
-                $params[substr($k, 1)] = $v;
-            }
-        }
-
-        return $params;
-    }
-
-    /**
-     * Renders a diff.
-     *
-     * @param Text_Diff $diff  A Text_Diff object.
-     *
-     * @return string  The formatted output.
-     */
-    function render($diff)
-    {
-        $xi = $yi = 1;
-        $block = false;
-        $context = array();
-
-        $nlead = $this->_leading_context_lines;
-        $ntrail = $this->_trailing_context_lines;
-
-        $output = $this->_startDiff();
-
-        $diffs = $diff->getDiff();
-        foreach ($diffs as $i => $edit) {
-            /* If these are unchanged (copied) lines, and we want to keep
+	/**
+	 * Get any renderer parameters.
+	 *
+	 * @return array  All parameters of this renderer object.
+	 */
+	function getParams()
+	{
+		$params = array();
+		foreach (get_object_vars($this) as $k => $v) {
+			if ($k[0] == '_') {
+				$params[substr($k, 1)] = $v;
+			}
+		}
+
+		return $params;
+	}
+
+	/**
+	 * Renders a diff.
+	 *
+	 * @param Text_Diff $diff  A Text_Diff object.
+	 *
+	 * @return string  The formatted output.
+	 */
+	function render($diff)
+	{
+		$xi = $yi = 1;
+		$block = false;
+		$context = array();
+
+		$nlead = $this->_leading_context_lines;
+		$ntrail = $this->_trailing_context_lines;
+
+		$output = $this->_startDiff();
+
+		$diffs = $diff->getDiff();
+		foreach ($diffs as $i => $edit) {
+			/* If these are unchanged (copied) lines, and we want to keep
              * leading or trailing context lines, extract them from the copy
              * block. */
-            if (is_a($edit, 'Text_Diff_Op_copy')) {
-                /* Do we have any diff blocks yet? */
-                if (is_array($block)) {
-                    /* How many lines to keep as context from the copy
+			if (is_a($edit, 'Text_Diff_Op_copy')) {
+				/* Do we have any diff blocks yet? */
+				if (is_array($block)) {
+					/* How many lines to keep as context from the copy
                      * block. */
-                    $keep = $i == count($diffs) - 1 ? $ntrail : $nlead + $ntrail;
-                    if (count($edit->orig) <= $keep) {
-                        /* We have less lines in the block than we want for
+					$keep = $i == count($diffs) - 1 ? $ntrail : $nlead + $ntrail;
+					if (count($edit->orig) <= $keep) {
+						/* We have less lines in the block than we want for
                          * context => keep the whole block. */
-                        $block[] = $edit;
-                    } else {
-                        if ($ntrail) {
-                            /* Create a new block with as many lines as we need
+						$block[] = $edit;
+					} else {
+						if ($ntrail) {
+							/* Create a new block with as many lines as we need
                              * for the trailing context. */
-                            $context = array_slice($edit->orig, 0, $ntrail);
-                            $block[] = new Text_Diff_Op_copy($context);
-                        }
-                        /* @todo */
-                        $output .= $this->_block($x0, $ntrail + $xi - $x0,
-                                                 $y0, $ntrail + $yi - $y0,
-                                                 $block);
-                        $block = false;
-                    }
-                }
-                /* Keep the copy block as the context for the next block. */
-                $context = $edit->orig;
-            } else {
-                /* Don't we have any diff blocks yet? */
-                if (!is_array($block)) {
-                    /* Extract context lines from the preceding copy block. */
-                    $context = array_slice($context, count($context) - $nlead);
-                    $x0 = $xi - count($context);
-                    $y0 = $yi - count($context);
-                    $block = array();
-                    if ($context) {
-                        $block[] = new Text_Diff_Op_copy($context);
-                    }
-                }
-                $block[] = $edit;
-            }
-
-            if ($edit->orig) {
-                $xi += count($edit->orig);
-            }
-            if ($edit->final) {
-                $yi += count($edit->final);
-            }
-        }
-
-        if (is_array($block)) {
-            $output .= $this->_block($x0, $xi - $x0,
-                                     $y0, $yi - $y0,
-                                     $block);
-        }
-
-        return $output . $this->_endDiff();
-    }
-
-    function _block($xbeg, $xlen, $ybeg, $ylen, &$edits)
-    {
-        $output = $this->_startBlock($this->_blockHeader($xbeg, $xlen, $ybeg, $ylen));
-
-        foreach ($edits as $edit) {
-            switch (strtolower(get_class($edit))) {
-            case 'text_diff_op_copy':
-                $output .= $this->_context($edit->orig);
-                break;
-
-            case 'text_diff_op_add':
-                $output .= $this->_added($edit->final);
-                break;
-
-            case 'text_diff_op_delete':
-                $output .= $this->_deleted($edit->orig);
-                break;
-
-            case 'text_diff_op_change':
-                $output .= $this->_changed($edit->orig, $edit->final);
-                break;
-            }
-        }
-
-        return $output . $this->_endBlock();
-    }
-
-    function _startDiff()
-    {
-        return '';
-    }
-
-    function _endDiff()
-    {
-        return '';
-    }
-
-    function _blockHeader($xbeg, $xlen, $ybeg, $ylen)
-    {
-        if ($xlen > 1) {
-            $xbeg .= ',' . ($xbeg + $xlen - 1);
-        }
-        if ($ylen > 1) {
-            $ybeg .= ',' . ($ybeg + $ylen - 1);
-        }
-
-        // this matches the GNU Diff behaviour
-        if ($xlen && !$ylen) {
-            $ybeg--;
-        } elseif (!$xlen) {
-            $xbeg--;
-        }
-
-        return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg;
-    }
-
-    function _startBlock($header)
-    {
-        return $header . "\n";
-    }
-
-    function _endBlock()
-    {
-        return '';
-    }
-
-    function _lines($lines, $prefix = ' ')
-    {
-        return $prefix . implode("\n$prefix", $lines) . "\n";
-    }
-
-    function _context($lines)
-    {
-        return $this->_lines($lines, '  ');
-    }
-
-    function _added($lines)
-    {
-        return $this->_lines($lines, '> ');
-    }
-
-    function _deleted($lines)
-    {
-        return $this->_lines($lines, '< ');
-    }
-
-    function _changed($orig, $final)
-    {
-        return $this->_deleted($orig) . "---\n" . $this->_added($final);
-    }
+							$context = array_slice($edit->orig, 0, $ntrail);
+							$block[] = new Text_Diff_Op_copy($context);
+						}
+						/* @todo */
+						$output .= $this->_block($x0, $ntrail + $xi - $x0,
+												 $y0, $ntrail + $yi - $y0,
+												 $block);
+						$block = false;
+					}
+				}
+				/* Keep the copy block as the context for the next block. */
+				$context = $edit->orig;
+			} else {
+				/* Don't we have any diff blocks yet? */
+				if (!is_array($block)) {
+					/* Extract context lines from the preceding copy block. */
+					$context = array_slice($context, count($context) - $nlead);
+					$x0 = $xi - count($context);
+					$y0 = $yi - count($context);
+					$block = array();
+					if ($context) {
+						$block[] = new Text_Diff_Op_copy($context);
+					}
+				}
+				$block[] = $edit;
+			}
+
+			if ($edit->orig) {
+				$xi += count($edit->orig);
+			}
+			if ($edit->final) {
+				$yi += count($edit->final);
+			}
+		}
+
+		if (is_array($block)) {
+			$output .= $this->_block($x0, $xi - $x0,
+									 $y0, $yi - $y0,
+									 $block);
+		}
+
+		return $output . $this->_endDiff();
+	}
+
+	function _block($xbeg, $xlen, $ybeg, $ylen, &$edits)
+	{
+		$output = $this->_startBlock($this->_blockHeader($xbeg, $xlen, $ybeg, $ylen));
+
+		foreach ($edits as $edit) {
+			switch (strtolower(get_class($edit))) {
+			case 'text_diff_op_copy':
+				$output .= $this->_context($edit->orig);
+				break;
+
+			case 'text_diff_op_add':
+				$output .= $this->_added($edit->final);
+				break;
+
+			case 'text_diff_op_delete':
+				$output .= $this->_deleted($edit->orig);
+				break;
+
+			case 'text_diff_op_change':
+				$output .= $this->_changed($edit->orig, $edit->final);
+				break;
+			}
+		}
+
+		return $output . $this->_endBlock();
+	}
+
+	function _startDiff()
+	{
+		return '';
+	}
+
+	function _endDiff()
+	{
+		return '';
+	}
+
+	function _blockHeader($xbeg, $xlen, $ybeg, $ylen)
+	{
+		if ($xlen > 1) {
+			$xbeg .= ',' . ($xbeg + $xlen - 1);
+		}
+		if ($ylen > 1) {
+			$ybeg .= ',' . ($ybeg + $ylen - 1);
+		}
+
+		// this matches the GNU Diff behaviour
+		if ($xlen && !$ylen) {
+			$ybeg--;
+		} elseif (!$xlen) {
+			$xbeg--;
+		}
+
+		return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg;
+	}
+
+	function _startBlock($header)
+	{
+		return $header . "\n";
+	}
+
+	function _endBlock()
+	{
+		return '';
+	}
+
+	function _lines($lines, $prefix = ' ')
+	{
+		return $prefix . implode("\n$prefix", $lines) . "\n";
+	}
+
+	function _context($lines)
+	{
+		return $this->_lines($lines, '  ');
+	}
+
+	function _added($lines)
+	{
+		return $this->_lines($lines, '> ');
+	}
+
+	function _deleted($lines)
+	{
+		return $this->_lines($lines, '< ');
+	}
+
+	function _changed($orig, $final)
+	{
+		return $this->_deleted($orig) . "---\n" . $this->_added($final);
+	}
 
 }

Switch Indentation +12 added lines, -12 removed lines

@@ -154,21 +154,21 @@
 
         foreach ($edits as $edit) {
             switch (strtolower(get_class($edit))) {
-            case 'text_diff_op_copy':
-                $output .= $this->_context($edit->orig);
-                break;
+            	case 'text_diff_op_copy':
+                	$output .= $this->_context($edit->orig);
+                	break;
 
-            case 'text_diff_op_add':
-                $output .= $this->_added($edit->final);
-                break;
+            	case 'text_diff_op_add':
+                	$output .= $this->_added($edit->final);
+                	break;
 
-            case 'text_diff_op_delete':
-                $output .= $this->_deleted($edit->orig);
-                break;
+            	case 'text_diff_op_delete':
+                	$output .= $this->_deleted($edit->orig);
+                	break;
 
-            case 'text_diff_op_change':
-                $output .= $this->_changed($edit->orig, $edit->final);
-                break;
+            	case 'text_diff_op_change':
+                	$output .= $this->_changed($edit->orig, $edit->final);
+                	break;
             }
         }
 

Spacing +15 added lines, -15 removed lines

@@ -33,10 +33,10 @@ 
     /**
      * Constructor.
      */
-    function __construct( $params = array() )
+    function __construct($params = array())
     {
         foreach ($params as $param => $value) {
-            $v = '_' . $param;
+            $v = '_'.$param;
             if (isset($this->$v)) {
                 $this->$v = $value;
             }
@@ -46,8 +46,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function Text_Diff_Renderer( $params = array() ) {
-		self::__construct( $params );
+	public function Text_Diff_Renderer($params = array()) {
+		self::__construct($params);
 	}
 
     /**
@@ -118,7 +118,7 @@ 
                 $context = $edit->orig;
             } else {
                 /* Don't we have any diff blocks yet? */
-                if (!is_array($block)) {
+                if ( ! is_array($block)) {
                     /* Extract context lines from the preceding copy block. */
                     $context = array_slice($context, count($context) - $nlead);
                     $x0 = $xi - count($context);
@@ -145,7 +145,7 @@ 
                                      $block);
         }
 
-        return $output . $this->_endDiff();
+        return $output.$this->_endDiff();
     }
 
     function _block($xbeg, $xlen, $ybeg, $ylen, &$edits)
@@ -172,7 +172,7 @@ 
             }
         }
 
-        return $output . $this->_endBlock();
+        return $output.$this->_endBlock();
     }
 
     function _startDiff()
@@ -188,25 +188,25 @@ 
     function _blockHeader($xbeg, $xlen, $ybeg, $ylen)
     {
         if ($xlen > 1) {
-            $xbeg .= ',' . ($xbeg + $xlen - 1);
+            $xbeg .= ','.($xbeg + $xlen - 1);
         }
         if ($ylen > 1) {
-            $ybeg .= ',' . ($ybeg + $ylen - 1);
+            $ybeg .= ','.($ybeg + $ylen - 1);
         }
 
         // this matches the GNU Diff behaviour
-        if ($xlen && !$ylen) {
+        if ($xlen && ! $ylen) {
             $ybeg--;
-        } elseif (!$xlen) {
+        } elseif ( ! $xlen) {
             $xbeg--;
         }
 
-        return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg;
+        return $xbeg.($xlen ? ($ylen ? 'c' : 'd') : 'a').$ybeg;
     }
 
     function _startBlock($header)
     {
-        return $header . "\n";
+        return $header."\n";
     }
 
     function _endBlock()
@@ -216,7 +216,7 @@ 
 
     function _lines($lines, $prefix = ' ')
     {
-        return $prefix . implode("\n$prefix", $lines) . "\n";
+        return $prefix.implode("\n$prefix", $lines)."\n";
     }
 
     function _context($lines)
@@ -236,7 +236,7 @@ 
 
     function _changed($orig, $final)
     {
-        return $this->_deleted($orig) . "---\n" . $this->_added($final);
+        return $this->_deleted($orig)."---\n".$this->_added($final);
     }
 
 }

src/wp-includes/Text/Diff/Renderer/inline.php

Doc Comments +6 added lines

@@ -100,6 +100,9 @@ 
         return $header;
     }
 
+    /**
+     * @param string[] $lines
+     */
     function _lines($lines, $prefix = ' ', $encode = true)
     {
         if ($encode) {
@@ -178,6 +181,9 @@ 
         return str_replace($nl, "\n", $renderer->render($diff)) . "\n";
     }
 
+    /**
+     * @param string $string
+     */
     function _splitOnWords($string, $newlineEscape = "\n")
     {
         // Ignore \0; otherwise the while loop will never finish.

Indentation +174 added lines, -174 removed lines

@@ -26,181 +26,181 @@
  */
 class Text_Diff_Renderer_inline extends Text_Diff_Renderer {
 
-    /**
-     * Number of leading context "lines" to preserve.
-     *
-     * @var integer
-     */
-    var $_leading_context_lines = 10000;
-
-    /**
-     * Number of trailing context "lines" to preserve.
-     *
-     * @var integer
-     */
-    var $_trailing_context_lines = 10000;
-
-    /**
-     * Prefix for inserted text.
-     *
-     * @var string
-     */
-    var $_ins_prefix = '<ins>';
-
-    /**
-     * Suffix for inserted text.
-     *
-     * @var string
-     */
-    var $_ins_suffix = '</ins>';
-
-    /**
-     * Prefix for deleted text.
-     *
-     * @var string
-     */
-    var $_del_prefix = '<del>';
-
-    /**
-     * Suffix for deleted text.
-     *
-     * @var string
-     */
-    var $_del_suffix = '</del>';
-
-    /**
-     * Header for each change block.
-     *
-     * @var string
-     */
-    var $_block_header = '';
-
-    /**
-     * Whether to split down to character-level.
-     *
-     * @var boolean
-     */
-    var $_split_characters = false;
-
-    /**
-     * What are we currently splitting on? Used to recurse to show word-level
-     * or character-level changes.
-     *
-     * @var string
-     */
-    var $_split_level = 'lines';
-
-    function _blockHeader($xbeg, $xlen, $ybeg, $ylen)
-    {
-        return $this->_block_header;
-    }
-
-    function _startBlock($header)
-    {
-        return $header;
-    }
-
-    function _lines($lines, $prefix = ' ', $encode = true)
-    {
-        if ($encode) {
-            array_walk($lines, array(&$this, '_encode'));
-        }
-
-        if ($this->_split_level == 'lines') {
-            return implode("\n", $lines) . "\n";
-        } else {
-            return implode('', $lines);
-        }
-    }
-
-    function _added($lines)
-    {
-        array_walk($lines, array(&$this, '_encode'));
-        $lines[0] = $this->_ins_prefix . $lines[0];
-        $lines[count($lines) - 1] .= $this->_ins_suffix;
-        return $this->_lines($lines, ' ', false);
-    }
-
-    function _deleted($lines, $words = false)
-    {
-        array_walk($lines, array(&$this, '_encode'));
-        $lines[0] = $this->_del_prefix . $lines[0];
-        $lines[count($lines) - 1] .= $this->_del_suffix;
-        return $this->_lines($lines, ' ', false);
-    }
-
-    function _changed($orig, $final)
-    {
-        /* If we've already split on characters, just display. */
-        if ($this->_split_level == 'characters') {
-            return $this->_deleted($orig)
-                . $this->_added($final);
-        }
-
-        /* If we've already split on words, just display. */
-        if ($this->_split_level == 'words') {
-            $prefix = '';
-            while ($orig[0] !== false && $final[0] !== false &&
-                   substr($orig[0], 0, 1) == ' ' &&
-                   substr($final[0], 0, 1) == ' ') {
-                $prefix .= substr($orig[0], 0, 1);
-                $orig[0] = substr($orig[0], 1);
-                $final[0] = substr($final[0], 1);
-            }
-            return $prefix . $this->_deleted($orig) . $this->_added($final);
-        }
-
-        $text1 = implode("\n", $orig);
-        $text2 = implode("\n", $final);
-
-        /* Non-printing newline marker. */
-        $nl = "\0";
-
-        if ($this->_split_characters) {
-            $diff = new Text_Diff('native',
-                                  array(preg_split('//', $text1),
-                                        preg_split('//', $text2)));
-        } else {
-            /* We want to split on word boundaries, but we need to preserve
+	/**
+	 * Number of leading context "lines" to preserve.
+	 *
+	 * @var integer
+	 */
+	var $_leading_context_lines = 10000;
+
+	/**
+	 * Number of trailing context "lines" to preserve.
+	 *
+	 * @var integer
+	 */
+	var $_trailing_context_lines = 10000;
+
+	/**
+	 * Prefix for inserted text.
+	 *
+	 * @var string
+	 */
+	var $_ins_prefix = '<ins>';
+
+	/**
+	 * Suffix for inserted text.
+	 *
+	 * @var string
+	 */
+	var $_ins_suffix = '</ins>';
+
+	/**
+	 * Prefix for deleted text.
+	 *
+	 * @var string
+	 */
+	var $_del_prefix = '<del>';
+
+	/**
+	 * Suffix for deleted text.
+	 *
+	 * @var string
+	 */
+	var $_del_suffix = '</del>';
+
+	/**
+	 * Header for each change block.
+	 *
+	 * @var string
+	 */
+	var $_block_header = '';
+
+	/**
+	 * Whether to split down to character-level.
+	 *
+	 * @var boolean
+	 */
+	var $_split_characters = false;
+
+	/**
+	 * What are we currently splitting on? Used to recurse to show word-level
+	 * or character-level changes.
+	 *
+	 * @var string
+	 */
+	var $_split_level = 'lines';
+
+	function _blockHeader($xbeg, $xlen, $ybeg, $ylen)
+	{
+		return $this->_block_header;
+	}
+
+	function _startBlock($header)
+	{
+		return $header;
+	}
+
+	function _lines($lines, $prefix = ' ', $encode = true)
+	{
+		if ($encode) {
+			array_walk($lines, array(&$this, '_encode'));
+		}
+
+		if ($this->_split_level == 'lines') {
+			return implode("\n", $lines) . "\n";
+		} else {
+			return implode('', $lines);
+		}
+	}
+
+	function _added($lines)
+	{
+		array_walk($lines, array(&$this, '_encode'));
+		$lines[0] = $this->_ins_prefix . $lines[0];
+		$lines[count($lines) - 1] .= $this->_ins_suffix;
+		return $this->_lines($lines, ' ', false);
+	}
+
+	function _deleted($lines, $words = false)
+	{
+		array_walk($lines, array(&$this, '_encode'));
+		$lines[0] = $this->_del_prefix . $lines[0];
+		$lines[count($lines) - 1] .= $this->_del_suffix;
+		return $this->_lines($lines, ' ', false);
+	}
+
+	function _changed($orig, $final)
+	{
+		/* If we've already split on characters, just display. */
+		if ($this->_split_level == 'characters') {
+			return $this->_deleted($orig)
+				. $this->_added($final);
+		}
+
+		/* If we've already split on words, just display. */
+		if ($this->_split_level == 'words') {
+			$prefix = '';
+			while ($orig[0] !== false && $final[0] !== false &&
+				   substr($orig[0], 0, 1) == ' ' &&
+				   substr($final[0], 0, 1) == ' ') {
+				$prefix .= substr($orig[0], 0, 1);
+				$orig[0] = substr($orig[0], 1);
+				$final[0] = substr($final[0], 1);
+			}
+			return $prefix . $this->_deleted($orig) . $this->_added($final);
+		}
+
+		$text1 = implode("\n", $orig);
+		$text2 = implode("\n", $final);
+
+		/* Non-printing newline marker. */
+		$nl = "\0";
+
+		if ($this->_split_characters) {
+			$diff = new Text_Diff('native',
+								  array(preg_split('//', $text1),
+										preg_split('//', $text2)));
+		} else {
+			/* We want to split on word boundaries, but we need to preserve
              * whitespace as well. Therefore we split on words, but include
              * all blocks of whitespace in the wordlist. */
-            $diff = new Text_Diff('native',
-                                  array($this->_splitOnWords($text1, $nl),
-                                        $this->_splitOnWords($text2, $nl)));
-        }
-
-        /* Get the diff in inline format. */
-        $renderer = new Text_Diff_Renderer_inline
-            (array_merge($this->getParams(),
-                         array('split_level' => $this->_split_characters ? 'characters' : 'words')));
-
-        /* Run the diff and get the output. */
-        return str_replace($nl, "\n", $renderer->render($diff)) . "\n";
-    }
-
-    function _splitOnWords($string, $newlineEscape = "\n")
-    {
-        // Ignore \0; otherwise the while loop will never finish.
-        $string = str_replace("\0", '', $string);
-
-        $words = array();
-        $length = strlen($string);
-        $pos = 0;
-
-        while ($pos < $length) {
-            // Eat a word with any preceding whitespace.
-            $spaces = strspn(substr($string, $pos), " \n");
-            $nextpos = strcspn(substr($string, $pos + $spaces), " \n");
-            $words[] = str_replace("\n", $newlineEscape, substr($string, $pos, $spaces + $nextpos));
-            $pos += $spaces + $nextpos;
-        }
-
-        return $words;
-    }
-
-    function _encode(&$string)
-    {
-        $string = htmlspecialchars($string);
-    }
+			$diff = new Text_Diff('native',
+								  array($this->_splitOnWords($text1, $nl),
+										$this->_splitOnWords($text2, $nl)));
+		}
+
+		/* Get the diff in inline format. */
+		$renderer = new Text_Diff_Renderer_inline
+			(array_merge($this->getParams(),
+						 array('split_level' => $this->_split_characters ? 'characters' : 'words')));
+
+		/* Run the diff and get the output. */
+		return str_replace($nl, "\n", $renderer->render($diff)) . "\n";
+	}
+
+	function _splitOnWords($string, $newlineEscape = "\n")
+	{
+		// Ignore \0; otherwise the while loop will never finish.
+		$string = str_replace("\0", '', $string);
+
+		$words = array();
+		$length = strlen($string);
+		$pos = 0;
+
+		while ($pos < $length) {
+			// Eat a word with any preceding whitespace.
+			$spaces = strspn(substr($string, $pos), " \n");
+			$nextpos = strcspn(substr($string, $pos + $spaces), " \n");
+			$words[] = str_replace("\n", $newlineEscape, substr($string, $pos, $spaces + $nextpos));
+			$pos += $spaces + $nextpos;
+		}
+
+		return $words;
+	}
+
+	function _encode(&$string)
+	{
+		$string = htmlspecialchars($string);
+	}
 
 }

Spacing +7 added lines, -8 removed lines

@@ -14,7 +14,7 @@ 
 /** Text_Diff_Renderer */
 
 // WP #7391
-require_once dirname(dirname(__FILE__)) . '/Renderer.php';
+require_once dirname(dirname(__FILE__)).'/Renderer.php';
 
 /**
  * "Inline" diff renderer.
@@ -107,7 +107,7 @@ 
         }
 
         if ($this->_split_level == 'lines') {
-            return implode("\n", $lines) . "\n";
+            return implode("\n", $lines)."\n";
         } else {
             return implode('', $lines);
         }
@@ -116,7 +116,7 @@ 
     function _added($lines)
     {
         array_walk($lines, array(&$this, '_encode'));
-        $lines[0] = $this->_ins_prefix . $lines[0];
+        $lines[0] = $this->_ins_prefix.$lines[0];
         $lines[count($lines) - 1] .= $this->_ins_suffix;
         return $this->_lines($lines, ' ', false);
     }
@@ -124,7 +124,7 @@ 
     function _deleted($lines, $words = false)
     {
         array_walk($lines, array(&$this, '_encode'));
-        $lines[0] = $this->_del_prefix . $lines[0];
+        $lines[0] = $this->_del_prefix.$lines[0];
         $lines[count($lines) - 1] .= $this->_del_suffix;
         return $this->_lines($lines, ' ', false);
     }
@@ -147,7 +147,7 @@ 
                 $orig[0] = substr($orig[0], 1);
                 $final[0] = substr($final[0], 1);
             }
-            return $prefix . $this->_deleted($orig) . $this->_added($final);
+            return $prefix.$this->_deleted($orig).$this->_added($final);
         }
 
         $text1 = implode("\n", $orig);
@@ -170,12 +170,11 @@ 
         }
 
         /* Get the diff in inline format. */
-        $renderer = new Text_Diff_Renderer_inline
-            (array_merge($this->getParams(),
+        $renderer = new Text_Diff_Renderer_inline(array_merge($this->getParams(),
                          array('split_level' => $this->_split_characters ? 'characters' : 'words')));
 
         /* Run the diff and get the output. */
-        return str_replace($nl, "\n", $renderer->render($diff)) . "\n";
+        return str_replace($nl, "\n", $renderer->render($diff))."\n";
     }
 
     function _splitOnWords($string, $newlineEscape = "\n")

src/wp-trackback.php

Doc Comments +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
  *
  * @since 0.71
  *
- * @param mixed  $error         Whether there was an error.
+ * @param integer  $error         Whether there was an error.
  *                              Default '0'. Accepts '0' or '1', true or false.
  * @param string $error_message Error message if an error occurred.
  */

Indentation +11 added lines, -11 removed lines

@@ -92,17 +92,17 @@
 
 if ( !empty($tb_url) && !empty($title) ) {
 	/**
-	* Fires before the trackback is added to a post.
-	*
-	* @since 4.7.0
-	*
-	* @param int    $tb_id     Post ID related to the trackback.
-	* @param string $tb_url    Trackback URL.
-	* @param string $charset   Character Set.
-	* @param string $title     Trackback Title.
-	* @param string $excerpt   Trackback Excerpt.
-	* @param string $blog_name Blog Name.
-	*/
+	 * Fires before the trackback is added to a post.
+	 *
+	 * @since 4.7.0
+	 *
+	 * @param int    $tb_id     Post ID related to the trackback.
+	 * @param string $tb_url    Trackback URL.
+	 * @param string $charset   Character Set.
+	 * @param string $title     Trackback Title.
+	 * @param string $excerpt   Trackback Excerpt.
+	 * @param string $blog_name Blog Name.
+	 */
 	do_action( 'pre_trackback_post', $tb_id, $tb_url, $charset, $title, $excerpt, $blog_name );
 
 	header('Content-Type: text/xml; charset=' . get_option('blog_charset') );

Spacing +27 added lines, -27 removed lines

@@ -9,8 +9,8 @@ 
  */
 
 if (empty($wp)) {
-	require_once( dirname( __FILE__ ) . '/wp-load.php' );
-	wp( array( 'tb' => '1' ) );
+	require_once(dirname(__FILE__).'/wp-load.php');
+	wp(array('tb' => '1'));
 }
 
 /**
@@ -25,7 +25,7 @@ 
  * @param string $error_message Error message if an error occurred.
  */
 function trackback_response($error = 0, $error_message = '') {
-	header('Content-Type: text/xml; charset=' . get_option('blog_charset') );
+	header('Content-Type: text/xml; charset='.get_option('blog_charset'));
 	if ($error) {
 		echo '<?xml version="1.0" encoding="utf-8"?'.">\n";
 		echo "<response>\n";
@@ -44,30 +44,30 @@ 
 // Trackback is done by a POST.
 $request_array = 'HTTP_POST_VARS';
 
-if ( !isset($_GET['tb_id']) || !$_GET['tb_id'] ) {
+if ( ! isset($_GET['tb_id']) || ! $_GET['tb_id']) {
 	$tb_id = explode('/', $_SERVER['REQUEST_URI']);
-	$tb_id = intval( $tb_id[ count($tb_id) - 1 ] );
+	$tb_id = intval($tb_id[count($tb_id) - 1]);
 }
 
-$tb_url  = isset($_POST['url'])     ? $_POST['url']     : '';
+$tb_url  = isset($_POST['url']) ? $_POST['url'] : '';
 $charset = isset($_POST['charset']) ? $_POST['charset'] : '';
 
 // These three are stripslashed here so they can be properly escaped after mb_convert_encoding().
-$title     = isset($_POST['title'])     ? wp_unslash($_POST['title'])      : '';
-$excerpt   = isset($_POST['excerpt'])   ? wp_unslash($_POST['excerpt'])    : '';
-$blog_name = isset($_POST['blog_name']) ? wp_unslash($_POST['blog_name'])  : '';
+$title     = isset($_POST['title']) ? wp_unslash($_POST['title']) : '';
+$excerpt   = isset($_POST['excerpt']) ? wp_unslash($_POST['excerpt']) : '';
+$blog_name = isset($_POST['blog_name']) ? wp_unslash($_POST['blog_name']) : '';
 
 if ($charset)
-	$charset = str_replace( array(',', ' '), '', strtoupper( trim($charset) ) );
+	$charset = str_replace(array(',', ' '), '', strtoupper(trim($charset)));
 else
 	$charset = 'ASCII, UTF-8, ISO-8859-1, JIS, EUC-JP, SJIS';
 
 // No valid uses for UTF-7.
-if ( false !== strpos($charset, 'UTF-7') )
+if (false !== strpos($charset, 'UTF-7'))
 	die;
 
 // For international trackbacks.
-if ( function_exists('mb_convert_encoding') ) {
+if (function_exists('mb_convert_encoding')) {
 	$title     = mb_convert_encoding($title, get_option('blog_charset'), $charset);
 	$excerpt   = mb_convert_encoding($excerpt, get_option('blog_charset'), $charset);
 	$blog_name = mb_convert_encoding($blog_name, get_option('blog_charset'), $charset);
@@ -78,11 +78,11 @@ 
 $excerpt   = wp_slash($excerpt);
 $blog_name = wp_slash($blog_name);
 
-if ( is_single() || is_page() )
+if (is_single() || is_page())
 	$tb_id = $posts[0]->ID;
 
-if ( !isset($tb_id) || !intval( $tb_id ) )
-	trackback_response( 1, __( 'I really need an ID for this to work.' ) );
+if ( ! isset($tb_id) || ! intval($tb_id))
+	trackback_response(1, __('I really need an ID for this to work.'));
 
 if (empty($title) && empty($tb_url) && empty($blog_name)) {
 	// If it doesn't look like a trackback at all.
@@ -90,7 +90,7 @@ 
 	exit;
 }
 
-if ( !empty($tb_url) && !empty($title) ) {
+if ( ! empty($tb_url) && ! empty($title)) {
 	/**
 	* Fires before the trackback is added to a post.
 	*
@@ -103,15 +103,15 @@ 
 	* @param string $excerpt   Trackback Excerpt.
 	* @param string $blog_name Blog Name.
 	*/
-	do_action( 'pre_trackback_post', $tb_id, $tb_url, $charset, $title, $excerpt, $blog_name );
+	do_action('pre_trackback_post', $tb_id, $tb_url, $charset, $title, $excerpt, $blog_name);
 
-	header('Content-Type: text/xml; charset=' . get_option('blog_charset') );
+	header('Content-Type: text/xml; charset='.get_option('blog_charset'));
 
-	if ( !pings_open($tb_id) )
-		trackback_response( 1, __( 'Sorry, trackbacks are closed for this item.' ) );
+	if ( ! pings_open($tb_id))
+		trackback_response(1, __('Sorry, trackbacks are closed for this item.'));
 
-	$title =  wp_html_excerpt( $title, 250, '&#8230;' );
-	$excerpt = wp_html_excerpt( $excerpt, 252, '&#8230;' );
+	$title = wp_html_excerpt($title, 250, '&#8230;');
+	$excerpt = wp_html_excerpt($excerpt, 252, '&#8230;');
 
 	$comment_post_ID = (int) $tb_id;
 	$comment_author = $blog_name;
@@ -120,9 +120,9 @@ 
 	$comment_content = "<strong>$title</strong>\n\n$excerpt";
 	$comment_type = 'trackback';
 
-	$dupe = $wpdb->get_results( $wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_author_url = %s", $comment_post_ID, $comment_author_url) );
-	if ( $dupe )
-		trackback_response( 1, __( 'We already have a ping from that URL for this post.' ) );
+	$dupe = $wpdb->get_results($wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_author_url = %s", $comment_post_ID, $comment_author_url));
+	if ($dupe)
+		trackback_response(1, __('We already have a ping from that URL for this post.'));
 
 	$commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type');
 
@@ -136,6 +136,6 @@ 
 	 *
 	 * @param int $trackback_id Trackback ID.
 	 */
-	do_action( 'trackback_post', $trackback_id );
-	trackback_response( 0 );
+	do_action('trackback_post', $trackback_id);
+	trackback_response(0);
 }

Braces +15 added lines, -9 removed lines

@@ -57,14 +57,16 @@ 
 $excerpt   = isset($_POST['excerpt'])   ? wp_unslash($_POST['excerpt'])    : '';
 $blog_name = isset($_POST['blog_name']) ? wp_unslash($_POST['blog_name'])  : '';
 
-if ($charset)
+if ($charset) {
 	$charset = str_replace( array(',', ' '), '', strtoupper( trim($charset) ) );
-else
+} else {
 	$charset = 'ASCII, UTF-8, ISO-8859-1, JIS, EUC-JP, SJIS';
+}
 
 // No valid uses for UTF-7.
-if ( false !== strpos($charset, 'UTF-7') )
+if ( false !== strpos($charset, 'UTF-7') ) {
 	die;
+}
 
 // For international trackbacks.
 if ( function_exists('mb_convert_encoding') ) {
@@ -78,11 +80,13 @@ 
 $excerpt   = wp_slash($excerpt);
 $blog_name = wp_slash($blog_name);
 
-if ( is_single() || is_page() )
+if ( is_single() || is_page() ) {
 	$tb_id = $posts[0]->ID;
+}
 
-if ( !isset($tb_id) || !intval( $tb_id ) )
+if ( !isset($tb_id) || !intval( $tb_id ) ) {
 	trackback_response( 1, __( 'I really need an ID for this to work.' ) );
+}
 
 if (empty($title) && empty($tb_url) && empty($blog_name)) {
 	// If it doesn't look like a trackback at all.
@@ -107,8 +111,9 @@ 
 
 	header('Content-Type: text/xml; charset=' . get_option('blog_charset') );
 
-	if ( !pings_open($tb_id) )
-		trackback_response( 1, __( 'Sorry, trackbacks are closed for this item.' ) );
+	if ( !pings_open($tb_id) ) {
+			trackback_response( 1, __( 'Sorry, trackbacks are closed for this item.' ) );
+	}
 
 	$title =  wp_html_excerpt( $title, 250, '…' );
 	$excerpt = wp_html_excerpt( $excerpt, 252, '…' );
@@ -121,8 +126,9 @@ 
 	$comment_type = 'trackback';
 
 	$dupe = $wpdb->get_results( $wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_author_url = %s", $comment_post_ID, $comment_author_url) );
-	if ( $dupe )
-		trackback_response( 1, __( 'We already have a ping from that URL for this post.' ) );
+	if ( $dupe ) {
+			trackback_response( 1, __( 'We already have a ping from that URL for this post.' ) );
+	}
 
 	$commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type');
 

tools/i18n/extract.php

Doc Comments +10 added lines

@@ -40,11 +40,17 @@ 
 		return $translations;
 	}
 
+	/**
+	 * @param string $prefix
+	 */
 	function extract_from_file( $file_name, $prefix ) {
 		$code = file_get_contents( $file_name );
 		return $this->extract_from_code( $code, $prefix . $file_name );
 	}
 
+	/**
+	 * @param string $path
+	 */
 	function does_file_name_match( $path, $excludes, $includes ) {
 		if ( $includes ) {
 			$matched_any_include = false;
@@ -128,6 +134,10 @@ 
 		return $entry;
 	}
 
+	/**
+	 * @param string $code
+	 * @param string $file_name
+	 */
 	function extract_from_code( $code, $file_name ) {
 		$translations = new Translations;
 		$function_calls = $this->find_function_calls( array_keys( $this->rules ), $code );

Switch Indentation +29 added lines, -29 removed lines

@@ -75,35 +75,35 @@
 		for( $i = 0; $i < count( $rule ); ++$i ) {
 			if ( $rule[$i] && ( !isset( $call['args'][$i] ) || !is_string( $call['args'][$i] ) || '' == $call['args'][$i] ) ) return false;
 			switch( $rule[$i] ) {
-			case 'string':
-				if ( $complete ) {
-					$multiple[] = $entry;
-					$entry = new Translation_Entry;
-					$complete = false;
-				}
-				$entry->singular = $call['args'][$i];
-				$complete = true;
-				break;
-			case 'singular':
-				if ( $complete ) {
-					$multiple[] = $entry;
-					$entry = new Translation_Entry;
-					$complete = false;
-				}
-				$entry->singular = $call['args'][$i];
-				$entry->is_plural = true;
-				break;
-			case 'plural':
-				$entry->plural = $call['args'][$i];
-				$entry->is_plural = true;
-				$complete = true;
-				break;
-			case 'context':
-				$entry->context = $call['args'][$i];
-				foreach( $multiple as &$single_entry ) {
-					$single_entry->context = $entry->context;
-				}
-				break;
+				case 'string':
+					if ( $complete ) {
+						$multiple[] = $entry;
+						$entry = new Translation_Entry;
+						$complete = false;
+					}
+					$entry->singular = $call['args'][$i];
+					$complete = true;
+					break;
+				case 'singular':
+					if ( $complete ) {
+						$multiple[] = $entry;
+						$entry = new Translation_Entry;
+						$complete = false;
+					}
+					$entry->singular = $call['args'][$i];
+					$entry->is_plural = true;
+					break;
+				case 'plural':
+					$entry->plural = $call['args'][$i];
+					$entry->is_plural = true;
+					$complete = true;
+					break;
+				case 'context':
+					$entry->context = $call['args'][$i];
+					foreach( $multiple as &$single_entry ) {
+						$single_entry->context = $entry->context;
+					}
+					break;
 			}
 		}
 		if ( isset( $call['line'] ) && $call['line'] ) {

Braces +29 added lines, -12 removed lines

@@ -26,7 +26,9 @@ 
 		$translations = new Translations;
 		$file_names = (array) scandir( '.' );
 		foreach ( $file_names as $file_name ) {
-			if ( '.' == $file_name || '..' == $file_name ) continue;
+			if ( '.' == $file_name || '..' == $file_name ) {
+				continue;
+			}
 			if ( preg_match( '/\.php$/', $file_name ) && $this->does_file_name_match( $prefix . $file_name, $excludes, $includes ) ) {
 				$extracted = $this->extract_from_file( $file_name, $prefix );
 				$translations->merge_originals_with( $extracted );
@@ -54,7 +56,9 @@ 
 					break;
 				}
 			}
-			if ( !$matched_any_include ) return false;
+			if ( !$matched_any_include ) {
+				return false;
+			}
 		}
 		if ( $excludes ) {
 			foreach( $excludes as $exclude ) {
@@ -68,12 +72,16 @@ 
 
 	function entry_from_call( $call, $file_name ) {
 		$rule = isset( $this->rules[$call['name']] )? $this->rules[$call['name']] : null;
-		if ( !$rule ) return null;
+		if ( !$rule ) {
+			return null;
+		}
 		$entry = new Translation_Entry;
 		$multiple = array();
 		$complete = false;
 		for( $i = 0; $i < count( $rule ); ++$i ) {
-			if ( $rule[$i] && ( !isset( $call['args'][$i] ) || !is_string( $call['args'][$i] ) || '' == $call['args'][$i] ) ) return false;
+			if ( $rule[$i] && ( !isset( $call['args'][$i] ) || !is_string( $call['args'][$i] ) || '' == $call['args'][$i] ) ) {
+				return false;
+			}
 			switch( $rule[$i] ) {
 			case 'string':
 				if ( $complete ) {
@@ -133,11 +141,12 @@ 
 		$function_calls = $this->find_function_calls( array_keys( $this->rules ), $code );
 		foreach( $function_calls as $call ) {
 			$entry = $this->entry_from_call( $call, $file_name );
-			if ( is_array( $entry ) )
-				foreach( $entry as $single_entry )
+			if ( is_array( $entry ) ) {
+							foreach( $entry as $single_entry )
 					$translations->add_entry_or_merge( $single_entry );
-			elseif ( $entry)
-				$translations->add_entry_or_merge( $entry );
+			} elseif ( $entry) {
+							$translations->add_entry_or_merge( $entry );
+			}
 		}
 		return $translations;
 	}
@@ -155,8 +164,12 @@ 
 		$in_func = false;
 		foreach( $tokens as $token ) {
 			$id = $text = null;
-			if ( is_array( $token ) ) list( $id, $text, $line ) = $token;
-			if ( T_WHITESPACE == $id ) continue;
+			if ( is_array( $token ) ) {
+				list( $id, $text, $line ) = $token;
+			}
+			if ( T_WHITESPACE == $id ) {
+				continue;
+			}
 			if ( T_STRING == $id && in_array( $text, $function_names ) && !$in_func ) {
 				$in_func = true;
 				$paren_level = -1;
@@ -177,7 +190,9 @@ 
 					$latest_comment = $text;
 				}
 			}
-			if ( !$in_func ) continue;
+			if ( !$in_func ) {
+				continue;
+			}
 			if ( '(' == $token ) {
 				$paren_level++;
 				if ( 0 == $paren_level ) { // start of first argument
@@ -197,7 +212,9 @@ 
 					$in_func = false;
 					$args[] = $current_argument;
 					$call = array( 'name' => $func_name, 'args' => $args, 'line' => $func_line );
-					if ( $func_comment ) $call['comment'] = $func_comment;
+					if ( $func_comment ) {
+						$call['comment'] = $func_comment;
+					}
 					$function_calls[] = $call;
 				}
 				$paren_level--;

Spacing +76 added lines, -76 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-$pomo = dirname( dirname( dirname( __FILE__ ) ) ) . '/src/wp-includes/pomo';
+$pomo = dirname(dirname(dirname(__FILE__))).'/src/wp-includes/pomo';
 require_once "$pomo/entry.php";
 require_once "$pomo/translations.php";
 
@@ -10,55 +10,55 @@ 
 class StringExtractor {
 
 	var $rules = array(
-		'__' => array( 'string' ),
-		'_e' => array( 'string' ),
-		'_n' => array( 'singular', 'plural' ),
+		'__' => array('string'),
+		'_e' => array('string'),
+		'_n' => array('singular', 'plural'),
 	);
 	var $comment_prefix = 'translators:';
 
-	function __construct( $rules = array() ) {
+	function __construct($rules = array()) {
 		$this->rules = $rules;
 	}
 
-	function extract_from_directory( $dir, $excludes = array(), $includes = array(), $prefix = '' ) {
+	function extract_from_directory($dir, $excludes = array(), $includes = array(), $prefix = '') {
 		$old_cwd = getcwd();
-		chdir( $dir );
+		chdir($dir);
 		$translations = new Translations;
-		$file_names = (array) scandir( '.' );
-		foreach ( $file_names as $file_name ) {
-			if ( '.' == $file_name || '..' == $file_name ) continue;
-			if ( preg_match( '/\.php$/', $file_name ) && $this->does_file_name_match( $prefix . $file_name, $excludes, $includes ) ) {
-				$extracted = $this->extract_from_file( $file_name, $prefix );
-				$translations->merge_originals_with( $extracted );
+		$file_names = (array) scandir('.');
+		foreach ($file_names as $file_name) {
+			if ('.' == $file_name || '..' == $file_name) continue;
+			if (preg_match('/\.php$/', $file_name) && $this->does_file_name_match($prefix.$file_name, $excludes, $includes)) {
+				$extracted = $this->extract_from_file($file_name, $prefix);
+				$translations->merge_originals_with($extracted);
 			}
-			if ( is_dir( $file_name ) ) {
-				$extracted = $this->extract_from_directory( $file_name, $excludes, $includes, $prefix . $file_name . '/' );
-				$translations->merge_originals_with( $extracted );
+			if (is_dir($file_name)) {
+				$extracted = $this->extract_from_directory($file_name, $excludes, $includes, $prefix.$file_name.'/');
+				$translations->merge_originals_with($extracted);
 			}
 		}
-		chdir( $old_cwd );
+		chdir($old_cwd);
 		return $translations;
 	}
 
-	function extract_from_file( $file_name, $prefix ) {
-		$code = file_get_contents( $file_name );
-		return $this->extract_from_code( $code, $prefix . $file_name );
+	function extract_from_file($file_name, $prefix) {
+		$code = file_get_contents($file_name);
+		return $this->extract_from_code($code, $prefix.$file_name);
 	}
 
-	function does_file_name_match( $path, $excludes, $includes ) {
-		if ( $includes ) {
+	function does_file_name_match($path, $excludes, $includes) {
+		if ($includes) {
 			$matched_any_include = false;
-			foreach( $includes as $include ) {
-				if ( preg_match( '|^'.$include.'$|', $path ) ) {
+			foreach ($includes as $include) {
+				if (preg_match('|^'.$include.'$|', $path)) {
 					$matched_any_include = true;
 					break;
 				}
 			}
-			if ( !$matched_any_include ) return false;
+			if ( ! $matched_any_include) return false;
 		}
-		if ( $excludes ) {
-			foreach( $excludes as $exclude ) {
-				if ( preg_match( '|^'.$exclude.'$|', $path ) ) {
+		if ($excludes) {
+			foreach ($excludes as $exclude) {
+				if (preg_match('|^'.$exclude.'$|', $path)) {
 					return false;
 				}
 			}
@@ -66,17 +66,17 @@ 
 		return true;
 	}
 
-	function entry_from_call( $call, $file_name ) {
-		$rule = isset( $this->rules[$call['name']] )? $this->rules[$call['name']] : null;
-		if ( !$rule ) return null;
+	function entry_from_call($call, $file_name) {
+		$rule = isset($this->rules[$call['name']]) ? $this->rules[$call['name']] : null;
+		if ( ! $rule) return null;
 		$entry = new Translation_Entry;
 		$multiple = array();
 		$complete = false;
-		for( $i = 0; $i < count( $rule ); ++$i ) {
-			if ( $rule[$i] && ( !isset( $call['args'][$i] ) || !is_string( $call['args'][$i] ) || '' == $call['args'][$i] ) ) return false;
-			switch( $rule[$i] ) {
+		for ($i = 0; $i < count($rule); ++$i) {
+			if ($rule[$i] && ( ! isset($call['args'][$i]) || ! is_string($call['args'][$i]) || '' == $call['args'][$i])) return false;
+			switch ($rule[$i]) {
 			case 'string':
-				if ( $complete ) {
+				if ($complete) {
 					$multiple[] = $entry;
 					$entry = new Translation_Entry;
 					$complete = false;
@@ -85,7 +85,7 @@ 
 				$complete = true;
 				break;
 			case 'singular':
-				if ( $complete ) {
+				if ($complete) {
 					$multiple[] = $entry;
 					$entry = new Translation_Entry;
 					$complete = false;
@@ -100,27 +100,27 @@ 
 				break;
 			case 'context':
 				$entry->context = $call['args'][$i];
-				foreach( $multiple as &$single_entry ) {
+				foreach ($multiple as &$single_entry) {
 					$single_entry->context = $entry->context;
 				}
 				break;
 			}
 		}
-		if ( isset( $call['line'] ) && $call['line'] ) {
-			$references = array( $file_name . ':' . $call['line'] );
+		if (isset($call['line']) && $call['line']) {
+			$references = array($file_name.':'.$call['line']);
 			$entry->references = $references;
-			foreach( $multiple as &$single_entry ) {
+			foreach ($multiple as &$single_entry) {
 				$single_entry->references = $references;
 			}
 		}
-		if ( isset( $call['comment'] ) && $call['comment'] ) {
-			$comments = rtrim( $call['comment'] ) . "\n";
+		if (isset($call['comment']) && $call['comment']) {
+			$comments = rtrim($call['comment'])."\n";
 			$entry->extracted_comments = $comments;
-			foreach( $multiple as &$single_entry ) {
+			foreach ($multiple as &$single_entry) {
 				$single_entry->extracted_comments = $comments;
 			}
 		}
-		if ( $multiple && $entry ) {
+		if ($multiple && $entry) {
 			$multiple[] = $entry;
 			return $multiple;
 		}
@@ -128,16 +128,16 @@ 
 		return $entry;
 	}
 
-	function extract_from_code( $code, $file_name ) {
+	function extract_from_code($code, $file_name) {
 		$translations = new Translations;
-		$function_calls = $this->find_function_calls( array_keys( $this->rules ), $code );
-		foreach( $function_calls as $call ) {
-			$entry = $this->entry_from_call( $call, $file_name );
-			if ( is_array( $entry ) )
-				foreach( $entry as $single_entry )
-					$translations->add_entry_or_merge( $single_entry );
-			elseif ( $entry)
-				$translations->add_entry_or_merge( $entry );
+		$function_calls = $this->find_function_calls(array_keys($this->rules), $code);
+		foreach ($function_calls as $call) {
+			$entry = $this->entry_from_call($call, $file_name);
+			if (is_array($entry))
+				foreach ($entry as $single_entry)
+					$translations->add_entry_or_merge($single_entry);
+			elseif ($entry)
+				$translations->add_entry_or_merge($entry);
 		}
 		return $translations;
 	}
@@ -148,70 +148,70 @@ 
 	 *	- args - array for the function arguments. Each string literal is represented by itself, other arguments are represented by null.
 	 *  - line - line number
 	 */
-	function find_function_calls( $function_names, $code ) {
-		$tokens = token_get_all( $code );
+	function find_function_calls($function_names, $code) {
+		$tokens = token_get_all($code);
 		$function_calls = array();
 		$latest_comment = false;
 		$in_func = false;
-		foreach( $tokens as $token ) {
+		foreach ($tokens as $token) {
 			$id = $text = null;
-			if ( is_array( $token ) ) list( $id, $text, $line ) = $token;
-			if ( T_WHITESPACE == $id ) continue;
-			if ( T_STRING == $id && in_array( $text, $function_names ) && !$in_func ) {
+			if (is_array($token)) list($id, $text, $line) = $token;
+			if (T_WHITESPACE == $id) continue;
+			if (T_STRING == $id && in_array($text, $function_names) && ! $in_func) {
 				$in_func = true;
 				$paren_level = -1;
 				$args = array();
 				$func_name = $text;
 				$func_line = $line;
-				$func_comment = $latest_comment? $latest_comment : '';
+				$func_comment = $latest_comment ? $latest_comment : '';
 
 				$just_got_into_func = true;
 				$latest_comment = false;
 				continue;
 			}
-			if ( T_COMMENT == $id ) {
-				$text = preg_replace( '%^\s+\*\s%m', '', $text );
-				$text = str_replace( array( "\r\n", "\n" ), ' ', $text );;
-				$text = trim( preg_replace( '%^(/\*|//)%', '', preg_replace( '%\*/$%', '', $text ) ) );
-				if ( 0 === stripos( $text, $this->comment_prefix ) ) {
+			if (T_COMMENT == $id) {
+				$text = preg_replace('%^\s+\*\s%m', '', $text);
+				$text = str_replace(array("\r\n", "\n"), ' ', $text); ;
+				$text = trim(preg_replace('%^(/\*|//)%', '', preg_replace('%\*/$%', '', $text)));
+				if (0 === stripos($text, $this->comment_prefix)) {
 					$latest_comment = $text;
 				}
 			}
-			if ( !$in_func ) continue;
-			if ( '(' == $token ) {
+			if ( ! $in_func) continue;
+			if ('(' == $token) {
 				$paren_level++;
-				if ( 0 == $paren_level ) { // start of first argument
+				if (0 == $paren_level) { // start of first argument
 					$just_got_into_func = false;
 					$current_argument = null;
 					$current_argument_is_just_literal = true;
 				}
 				continue;
 			}
-			if ( $just_got_into_func ) {
+			if ($just_got_into_func) {
 				// there wasn't a opening paren just after the function name -- this means it is not a function
 				$in_func = false;
 				$just_got_into_func = false;
 			}
-			if ( ')' == $token ) {
-				if ( 0 == $paren_level ) {
+			if (')' == $token) {
+				if (0 == $paren_level) {
 					$in_func = false;
 					$args[] = $current_argument;
-					$call = array( 'name' => $func_name, 'args' => $args, 'line' => $func_line );
-					if ( $func_comment ) $call['comment'] = $func_comment;
+					$call = array('name' => $func_name, 'args' => $args, 'line' => $func_line);
+					if ($func_comment) $call['comment'] = $func_comment;
 					$function_calls[] = $call;
 				}
 				$paren_level--;
 				continue;
 			}
-			if ( ',' == $token && 0 == $paren_level ) {
+			if (',' == $token && 0 == $paren_level) {
 				$args[] = $current_argument;
 				$current_argument = null;
 				$current_argument_is_just_literal = true;
 				continue;
 			}
-			if ( T_CONSTANT_ENCAPSED_STRING == $id && $current_argument_is_just_literal ) {
+			if (T_CONSTANT_ENCAPSED_STRING == $id && $current_argument_is_just_literal) {
 				// we can use eval safely, because we are sure $text is just a string literal
-				eval('$current_argument = '.$text.';' );
+				eval('$current_argument = '.$text.';');
 				continue;
 			}
 			$current_argument_is_just_literal = false;