ntwb / wordpress

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-includes/wp-diff.php

Doc Comments +2 added lines, -2 removed lines

@@ -495,7 +495,7 @@ 
 	 * @access public
 	 *
 	 * @param string $name Property to check if set.
-	 * @return bool Whether the property is set.
+	 * @return boolean|null Whether the property is set.
 	 */
 	public function __isset( $name ) {
 		if ( in_array( $name, $this->compat_fields ) ) {
@@ -532,7 +532,7 @@ 
 	 *
 	 * @param string $string
 	 * @param string $newlineEscape
-	 * @return string
+	 * @return string[]
 	 */
 	public function _splitOnWords($string, $newlineEscape = "\n") {
 		$string = str_replace("\0", '', $string);

Braces +49 added lines, -35 removed lines

@@ -81,8 +81,9 @@ 
 	 */
 	public function __construct( $params = array() ) {
 		parent::__construct( $params );
-		if ( isset( $params[ 'show_split_view' ] ) )
-			$this->_show_split_view = $params[ 'show_split_view' ];
+		if ( isset( $params[ 'show_split_view' ] ) ) {
+					$this->_show_split_view = $params[ 'show_split_view' ];
+		}
 	}
 
 	/**
@@ -280,8 +281,10 @@ 
 					//	we double the length of chars not in those tags.
 					$stripped_diff = strlen(strip_tags( $diff )) * 2 - $stripped_matches;
 					$diff_ratio = $stripped_matches / $stripped_diff;
-					if ( $diff_ratio > $this->_diff_threshold )
-						continue; // Too different. Don't save diffs.
+					if ( $diff_ratio > $this->_diff_threshold ) {
+											continue;
+					}
+					// Too different. Don't save diffs.
 				}
 
 				// Un-inline the diffs by removing del or ins
@@ -292,23 +295,26 @@ 
 
 		foreach ( array_keys($orig_rows) as $row ) {
 			// Both columns have blanks. Ignore them.
-			if ( $orig_rows[$row] < 0 && $final_rows[$row] < 0 )
-				continue;
+			if ( $orig_rows[$row] < 0 && $final_rows[$row] < 0 ) {
+							continue;
+			}
 
 			// If we have a word based diff, use it. Otherwise, use the normal line.
-			if ( isset( $orig_diffs[$orig_rows[$row]] ) )
-				$orig_line = $orig_diffs[$orig_rows[$row]];
-			elseif ( isset( $orig[$orig_rows[$row]] ) )
-				$orig_line = htmlspecialchars($orig[$orig_rows[$row]]);
-			else
-				$orig_line = '';
-
-			if ( isset( $final_diffs[$final_rows[$row]] ) )
-				$final_line = $final_diffs[$final_rows[$row]];
-			elseif ( isset( $final[$final_rows[$row]] ) )
-				$final_line = htmlspecialchars($final[$final_rows[$row]]);
-			else
-				$final_line = '';
+			if ( isset( $orig_diffs[$orig_rows[$row]] ) ) {
+							$orig_line = $orig_diffs[$orig_rows[$row]];
+			} elseif ( isset( $orig[$orig_rows[$row]] ) ) {
+							$orig_line = htmlspecialchars($orig[$orig_rows[$row]]);
+			} else {
+							$orig_line = '';
+			}
+
+			if ( isset( $final_diffs[$final_rows[$row]] ) ) {
+							$final_line = $final_diffs[$final_rows[$row]];
+			} elseif ( isset( $final[$final_rows[$row]] ) ) {
+							$final_line = htmlspecialchars($final[$final_rows[$row]]);
+			} else {
+							$final_line = '';
+			}
 
 			if ( $orig_rows[$row] < 0 ) { // Orig is blank. This is really an added row.
 				$r .= $this->_added( array($final_line), false );
@@ -360,8 +366,9 @@ 
 			$f = (int) $f;
 
 			// Already have better matches for these guys
-			if ( isset($orig_matches[$o]) && isset($final_matches[$f]) )
-				continue;
+			if ( isset($orig_matches[$o]) && isset($final_matches[$f]) ) {
+							continue;
+			}
 
 			// First match for these guys. Must be best match
 			if ( !isset($orig_matches[$o]) && !isset($final_matches[$f]) ) {
@@ -371,12 +378,14 @@ 
 			}
 
 			// Best match of this final is already taken?  Must mean this final is a new row.
-			if ( isset($orig_matches[$o]) )
-				$final_matches[$f] = 'x';
+			if ( isset($orig_matches[$o]) ) {
+							$final_matches[$f] = 'x';
+			}
 
 			// Best match of this orig is already taken?  Must mean this orig is a deleted row.
-			elseif ( isset($final_matches[$f]) )
-				$orig_matches[$o] = 'x';
+			elseif ( isset($final_matches[$f]) ) {
+							$orig_matches[$o] = 'x';
+			}
 		}
 
 		// We read the text in this order
@@ -397,24 +406,28 @@ 
 				array_splice( $final_rows, $orig_pos, 0, -1 );
 			} elseif ( $final_pos < $orig_pos ) { // This orig's match is up a ways. Pad final with blank rows.
 				$diff_pos = $final_pos - $orig_pos;
-				while ( $diff_pos < 0 )
-					array_splice( $final_rows, $orig_pos, 0, $diff_pos++ );
+				while ( $diff_pos < 0 ) {
+									array_splice( $final_rows, $orig_pos, 0, $diff_pos++ );
+				}
 			} elseif ( $final_pos > $orig_pos ) { // This orig's match is down a ways. Pad orig with blank rows.
 				$diff_pos = $orig_pos - $final_pos;
-				while ( $diff_pos < 0 )
-					array_splice( $orig_rows, $orig_pos, 0, $diff_pos++ );
+				while ( $diff_pos < 0 ) {
+									array_splice( $orig_rows, $orig_pos, 0, $diff_pos++ );
+				}
 			}
 		}
 
 		// Pad the ends with blank rows if the columns aren't the same length
 		$diff_count = count($orig_rows) - count($final_rows);
 		if ( $diff_count < 0 ) {
-			while ( $diff_count < 0 )
-				array_push($orig_rows, $diff_count++);
+			while ( $diff_count < 0 ) {
+							array_push($orig_rows, $diff_count++);
+			}
 		} elseif ( $diff_count > 0 ) {
 			$diff_count = -1 * $diff_count;
-			while ( $diff_count < 0 )
-				array_push($final_rows, $diff_count++);
+			while ( $diff_count < 0 ) {
+							array_push($final_rows, $diff_count++);
+			}
 		}
 
 		return array($orig_matches, $final_matches, $orig_rows, $final_rows);
@@ -438,8 +451,9 @@ 
 		$difference = array_sum( array_map( array($this, 'difference'), $chars1, $chars2 ) );
 
 		// $string1 has zero length? Odd. Give huge penalty by not dividing.
-		if ( !$string1 )
-			return $difference;
+		if ( !$string1 ) {
+					return $difference;
+		}
 
 		// Return distance per character (of string1).
 		return $difference / strlen($string1);

Spacing +100 added lines, -100 removed lines

@@ -8,13 +8,13 @@ 
  * @subpackage Diff
  */
 
-if ( ! class_exists( 'Text_Diff', false ) ) {
+if ( ! class_exists('Text_Diff', false)) {
 	/** Text_Diff class */
-	require( dirname(__FILE__).'/Text/Diff.php' );
+	require(dirname(__FILE__).'/Text/Diff.php');
 	/** Text_Diff_Renderer class */
-	require( dirname(__FILE__).'/Text/Diff/Renderer.php' );
+	require(dirname(__FILE__).'/Text/Diff/Renderer.php');
 	/** Text_Diff_Renderer_inline class */
-	require( dirname(__FILE__).'/Text/Diff/Renderer/inline.php' );
+	require(dirname(__FILE__).'/Text/Diff/Renderer/inline.php');
 }
 
 /**
@@ -31,7 +31,7 @@ 
 	 * @access public
 	 * @since 2.6.0
 	 */
-	public $_leading_context_lines  = 10000;
+	public $_leading_context_lines = 10000;
 
 	/**
 	 * @see Text_Diff_Renderer::_trailing_context_lines
@@ -68,7 +68,7 @@ 
 	 */
 	protected $_show_split_view = true;
 
-	protected $compat_fields = array( '_show_split_view', 'inline_diff_renderer', '_diff_threshold' );
+	protected $compat_fields = array('_show_split_view', 'inline_diff_renderer', '_diff_threshold');
 
 	/**
 	 * Constructor - Call parent constructor with params array.
@@ -79,10 +79,10 @@ 
 	 *
 	 * @param array $params
 	 */
-	public function __construct( $params = array() ) {
-		parent::__construct( $params );
-		if ( isset( $params[ 'show_split_view' ] ) )
-			$this->_show_split_view = $params[ 'show_split_view' ];
+	public function __construct($params = array()) {
+		parent::__construct($params);
+		if (isset($params['show_split_view']))
+			$this->_show_split_view = $params['show_split_view'];
 	}
 
 	/**
@@ -91,7 +91,7 @@ 
 	 * @param string $header
 	 * @return string
 	 */
-	public function _startBlock( $header ) {
+	public function _startBlock($header) {
 		return '';
 	}
 
@@ -101,7 +101,7 @@ 
 	 * @param array $lines
 	 * @param string $prefix
 	 */
-	public function _lines( $lines, $prefix=' ' ) {
+	public function _lines($lines, $prefix = ' ') {
 	}
 
 	/**
@@ -110,7 +110,7 @@ 
 	 * @param string $line HTML-escape the value.
 	 * @return string
 	 */
-	public function addedLine( $line ) {
+	public function addedLine($line) {
 		return "<td class='diff-addedline'>{$line}</td>";
 
 	}
@@ -121,7 +121,7 @@ 
 	 * @param string $line HTML-escape the value.
 	 * @return string
 	 */
-	public function deletedLine( $line ) {
+	public function deletedLine($line) {
 		return "<td class='diff-deletedline'>{$line}</td>";
 	}
 
@@ -131,7 +131,7 @@ 
 	 * @param string $line HTML-escape the value.
 	 * @return string
 	 */
-	public function contextLine( $line ) {
+	public function contextLine($line) {
 		return "<td class='diff-context'>{$line}</td>";
 	}
 
@@ -152,11 +152,11 @@ 
 	 * @param bool $encode
 	 * @return string
 	 */
-	public function _added( $lines, $encode = true ) {
+	public function _added($lines, $encode = true) {
 		$r = '';
 		foreach ($lines as $line) {
-			if ( $encode ) {
-				$processed_line = htmlspecialchars( $line );
+			if ($encode) {
+				$processed_line = htmlspecialchars($line);
 
 				/**
 				 * Contextually filter a diffed line.
@@ -171,13 +171,13 @@ 
 				 * @param String $line           The unprocessed diffed line.
 		 		 * @param string null            The line context. Values are 'added', 'deleted' or 'unchanged'.
 				 */
-				$line = apply_filters( 'process_text_diff_html', $processed_line, $line, 'added' );
+				$line = apply_filters('process_text_diff_html', $processed_line, $line, 'added');
 			}
 
-			if ( $this->_show_split_view ) {
-				$r .= '<tr>' . $this->emptyLine() . $this->emptyLine() . $this->addedLine( $line ) . "</tr>\n";
+			if ($this->_show_split_view) {
+				$r .= '<tr>'.$this->emptyLine().$this->emptyLine().$this->addedLine($line)."</tr>\n";
 			} else {
-				$r .= '<tr>' . $this->addedLine( $line ) . "</tr>\n";
+				$r .= '<tr>'.$this->addedLine($line)."</tr>\n";
 			}
 		}
 		return $r;
@@ -191,19 +191,19 @@ 
 	 * @param bool $encode
 	 * @return string
 	 */
-	public function _deleted( $lines, $encode = true ) {
+	public function _deleted($lines, $encode = true) {
 		$r = '';
 		foreach ($lines as $line) {
-			if ( $encode ) {
-				$processed_line = htmlspecialchars( $line );
+			if ($encode) {
+				$processed_line = htmlspecialchars($line);
 
 				/** This filter is documented in wp-includes/wp-diff.php */
-				$line = apply_filters( 'process_text_diff_html', $processed_line, $line, 'deleted' );
+				$line = apply_filters('process_text_diff_html', $processed_line, $line, 'deleted');
 			}
-			if ( $this->_show_split_view ) {
-				$r .= '<tr>' . $this->deletedLine( $line ) . $this->emptyLine() . $this->emptyLine() . "</tr>\n";
+			if ($this->_show_split_view) {
+				$r .= '<tr>'.$this->deletedLine($line).$this->emptyLine().$this->emptyLine()."</tr>\n";
 			} else {
-				$r .= '<tr>' . $this->deletedLine( $line ) . "</tr>\n";
+				$r .= '<tr>'.$this->deletedLine($line)."</tr>\n";
 			}
 
 		}
@@ -218,19 +218,19 @@ 
 	 * @param bool $encode
 	 * @return string
 	 */
-	public function _context( $lines, $encode = true ) {
+	public function _context($lines, $encode = true) {
 		$r = '';
 		foreach ($lines as $line) {
-			if ( $encode ) {
-				$processed_line = htmlspecialchars( $line );
+			if ($encode) {
+				$processed_line = htmlspecialchars($line);
 
 				/** This filter is documented in wp-includes/wp-diff.php */
-				$line = apply_filters( 'process_text_diff_html', $processed_line, $line, 'unchanged' );
+				$line = apply_filters('process_text_diff_html', $processed_line, $line, 'unchanged');
 			}
-			if (  $this->_show_split_view ) {
-				$r .= '<tr>' . $this->contextLine( $line ) . $this->emptyLine() . $this->contextLine( $line )  . "</tr>\n";
+			if ($this->_show_split_view) {
+				$r .= '<tr>'.$this->contextLine($line).$this->emptyLine().$this->contextLine($line)."</tr>\n";
 			} else {
-				$r .= '<tr>' . $this->contextLine( $line ) . "</tr>\n";
+				$r .= '<tr>'.$this->contextLine($line)."</tr>\n";
 			}
 		}
 		return $r;
@@ -249,7 +249,7 @@ 
 	 * @param array $final
 	 * @return string
 	 */
-	public function _changed( $orig, $final ) {
+	public function _changed($orig, $final) {
 		$r = '';
 
 		// Does the aforementioned additional processing
@@ -259,66 +259,66 @@ 
 		// *_rows are column vectors for the orig column and the final column.
 		//	row >= 0: an indix of the $orig or $final array
 		//	row  < 0: a blank row for that column
-		list($orig_matches, $final_matches, $orig_rows, $final_rows) = $this->interleave_changed_lines( $orig, $final );
+		list($orig_matches, $final_matches, $orig_rows, $final_rows) = $this->interleave_changed_lines($orig, $final);
 
 		// These will hold the word changes as determined by an inline diff
 		$orig_diffs  = array();
 		$final_diffs = array();
 
 		// Compute word diffs for each matched pair using the inline diff
-		foreach ( $orig_matches as $o => $f ) {
-			if ( is_numeric($o) && is_numeric($f) ) {
-				$text_diff = new Text_Diff( 'auto', array( array($orig[$o]), array($final[$f]) ) );
+		foreach ($orig_matches as $o => $f) {
+			if (is_numeric($o) && is_numeric($f)) {
+				$text_diff = new Text_Diff('auto', array(array($orig[$o]), array($final[$f])));
 				$renderer = new $this->inline_diff_renderer;
-				$diff = $renderer->render( $text_diff );
+				$diff = $renderer->render($text_diff);
 
 				// If they're too different, don't include any <ins> or <dels>
-				if ( preg_match_all( '!(<ins>.*?</ins>|<del>.*?</del>)!', $diff, $diff_matches ) ) {
+				if (preg_match_all('!(<ins>.*?</ins>|<del>.*?</del>)!', $diff, $diff_matches)) {
 					// length of all text between <ins> or <del>
-					$stripped_matches = strlen(strip_tags( join(' ', $diff_matches[0]) ));
+					$stripped_matches = strlen(strip_tags(join(' ', $diff_matches[0])));
 					// since we count lengith of text between <ins> or <del> (instead of picking just one),
 					//	we double the length of chars not in those tags.
-					$stripped_diff = strlen(strip_tags( $diff )) * 2 - $stripped_matches;
+					$stripped_diff = strlen(strip_tags($diff)) * 2 - $stripped_matches;
 					$diff_ratio = $stripped_matches / $stripped_diff;
-					if ( $diff_ratio > $this->_diff_threshold )
+					if ($diff_ratio > $this->_diff_threshold)
 						continue; // Too different. Don't save diffs.
 				}
 
 				// Un-inline the diffs by removing del or ins
-				$orig_diffs[$o]  = preg_replace( '|<ins>.*?</ins>|', '', $diff );
-				$final_diffs[$f] = preg_replace( '|<del>.*?</del>|', '', $diff );
+				$orig_diffs[$o]  = preg_replace('|<ins>.*?</ins>|', '', $diff);
+				$final_diffs[$f] = preg_replace('|<del>.*?</del>|', '', $diff);
 			}
 		}
 
-		foreach ( array_keys($orig_rows) as $row ) {
+		foreach (array_keys($orig_rows) as $row) {
 			// Both columns have blanks. Ignore them.
-			if ( $orig_rows[$row] < 0 && $final_rows[$row] < 0 )
+			if ($orig_rows[$row] < 0 && $final_rows[$row] < 0)
 				continue;
 
 			// If we have a word based diff, use it. Otherwise, use the normal line.
-			if ( isset( $orig_diffs[$orig_rows[$row]] ) )
+			if (isset($orig_diffs[$orig_rows[$row]]))
 				$orig_line = $orig_diffs[$orig_rows[$row]];
-			elseif ( isset( $orig[$orig_rows[$row]] ) )
+			elseif (isset($orig[$orig_rows[$row]]))
 				$orig_line = htmlspecialchars($orig[$orig_rows[$row]]);
 			else
 				$orig_line = '';
 
-			if ( isset( $final_diffs[$final_rows[$row]] ) )
+			if (isset($final_diffs[$final_rows[$row]]))
 				$final_line = $final_diffs[$final_rows[$row]];
-			elseif ( isset( $final[$final_rows[$row]] ) )
+			elseif (isset($final[$final_rows[$row]]))
 				$final_line = htmlspecialchars($final[$final_rows[$row]]);
 			else
 				$final_line = '';
 
-			if ( $orig_rows[$row] < 0 ) { // Orig is blank. This is really an added row.
-				$r .= $this->_added( array($final_line), false );
-			} elseif ( $final_rows[$row] < 0 ) { // Final is blank. This is really a deleted row.
-				$r .= $this->_deleted( array($orig_line), false );
+			if ($orig_rows[$row] < 0) { // Orig is blank. This is really an added row.
+				$r .= $this->_added(array($final_line), false);
+			} elseif ($final_rows[$row] < 0) { // Final is blank. This is really a deleted row.
+				$r .= $this->_deleted(array($orig_line), false);
 			} else { // A true changed row.
-				if ( $this->_show_split_view ) {
-					$r .= '<tr>' . $this->deletedLine( $orig_line ) . $this->emptyLine() . $this->addedLine( $final_line ) . "</tr>\n";
+				if ($this->_show_split_view) {
+					$r .= '<tr>'.$this->deletedLine($orig_line).$this->emptyLine().$this->addedLine($final_line)."</tr>\n";
 				} else {
-					$r .= '<tr>' . $this->deletedLine( $orig_line ) . "</tr><tr>" . $this->addedLine( $final_line ) . "</tr>\n";
+					$r .= '<tr>'.$this->deletedLine($orig_line)."</tr><tr>".$this->addedLine($final_line)."</tr>\n";
 				}
 			}
 		}
@@ -340,13 +340,13 @@ 
 	 * @param array $final
 	 * @return array
 	 */
-	public function interleave_changed_lines( $orig, $final ) {
+	public function interleave_changed_lines($orig, $final) {
 
 		// Contains all pairwise string comparisons. Keys are such that this need only be a one dimensional array.
 		$matches = array();
-		foreach ( array_keys($orig) as $o ) {
-			foreach ( array_keys($final) as $f ) {
-				$matches["$o,$f"] = $this->compute_string_distance( $orig[$o], $final[$f] );
+		foreach (array_keys($orig) as $o) {
+			foreach (array_keys($final) as $f) {
+				$matches["$o,$f"] = $this->compute_string_distance($orig[$o], $final[$f]);
 			}
 		}
 		asort($matches); // Order by string distance.
@@ -354,28 +354,28 @@ 
 		$orig_matches  = array();
 		$final_matches = array();
 
-		foreach ( $matches as $keys => $difference ) {
+		foreach ($matches as $keys => $difference) {
 			list($o, $f) = explode(',', $keys);
 			$o = (int) $o;
 			$f = (int) $f;
 
 			// Already have better matches for these guys
-			if ( isset($orig_matches[$o]) && isset($final_matches[$f]) )
+			if (isset($orig_matches[$o]) && isset($final_matches[$f]))
 				continue;
 
 			// First match for these guys. Must be best match
-			if ( !isset($orig_matches[$o]) && !isset($final_matches[$f]) ) {
+			if ( ! isset($orig_matches[$o]) && ! isset($final_matches[$f])) {
 				$orig_matches[$o] = $f;
 				$final_matches[$f] = $o;
 				continue;
 			}
 
 			// Best match of this final is already taken?  Must mean this final is a new row.
-			if ( isset($orig_matches[$o]) )
+			if (isset($orig_matches[$o]))
 				$final_matches[$f] = 'x';
 
 			// Best match of this orig is already taken?  Must mean this orig is a deleted row.
-			elseif ( isset($final_matches[$f]) )
+			elseif (isset($final_matches[$f]))
 				$orig_matches[$o] = 'x';
 		}
 
@@ -389,31 +389,31 @@ 
 
 		// Interleaves rows with blanks to keep matches aligned.
 		// We may end up with some extraneous blank rows, but we'll just ignore them later.
-		foreach ( $orig_rows_copy as $orig_row ) {
+		foreach ($orig_rows_copy as $orig_row) {
 			$final_pos = array_search($orig_matches[$orig_row], $final_rows, true);
 			$orig_pos = (int) array_search($orig_row, $orig_rows, true);
 
-			if ( false === $final_pos ) { // This orig is paired with a blank final.
-				array_splice( $final_rows, $orig_pos, 0, -1 );
-			} elseif ( $final_pos < $orig_pos ) { // This orig's match is up a ways. Pad final with blank rows.
+			if (false === $final_pos) { // This orig is paired with a blank final.
+				array_splice($final_rows, $orig_pos, 0, -1);
+			} elseif ($final_pos < $orig_pos) { // This orig's match is up a ways. Pad final with blank rows.
 				$diff_pos = $final_pos - $orig_pos;
-				while ( $diff_pos < 0 )
-					array_splice( $final_rows, $orig_pos, 0, $diff_pos++ );
-			} elseif ( $final_pos > $orig_pos ) { // This orig's match is down a ways. Pad orig with blank rows.
+				while ($diff_pos < 0)
+					array_splice($final_rows, $orig_pos, 0, $diff_pos++);
+			} elseif ($final_pos > $orig_pos) { // This orig's match is down a ways. Pad orig with blank rows.
 				$diff_pos = $orig_pos - $final_pos;
-				while ( $diff_pos < 0 )
-					array_splice( $orig_rows, $orig_pos, 0, $diff_pos++ );
+				while ($diff_pos < 0)
+					array_splice($orig_rows, $orig_pos, 0, $diff_pos++);
 			}
 		}
 
 		// Pad the ends with blank rows if the columns aren't the same length
 		$diff_count = count($orig_rows) - count($final_rows);
-		if ( $diff_count < 0 ) {
-			while ( $diff_count < 0 )
+		if ($diff_count < 0) {
+			while ($diff_count < 0)
 				array_push($orig_rows, $diff_count++);
-		} elseif ( $diff_count > 0 ) {
+		} elseif ($diff_count > 0) {
 			$diff_count = -1 * $diff_count;
-			while ( $diff_count < 0 )
+			while ($diff_count < 0)
 				array_push($final_rows, $diff_count++);
 		}
 
@@ -429,16 +429,16 @@ 
 	 * @param string $string2
 	 * @return int
 	 */
-	public function compute_string_distance( $string1, $string2 ) {
+	public function compute_string_distance($string1, $string2) {
 		// Vectors containing character frequency for all chars in each string
 		$chars1 = count_chars($string1);
 		$chars2 = count_chars($string2);
 
 		// L1-norm of difference vector.
-		$difference = array_sum( array_map( array($this, 'difference'), $chars1, $chars2 ) );
+		$difference = array_sum(array_map(array($this, 'difference'), $chars1, $chars2));
 
 		// $string1 has zero length? Odd. Give huge penalty by not dividing.
-		if ( !$string1 )
+		if ( ! $string1)
 			return $difference;
 
 		// Return distance per character (of string1).
@@ -453,8 +453,8 @@ 
 	 * @param int $b
 	 * @return int
 	 */
-	public function difference( $a, $b ) {
-		return abs( $a - $b );
+	public function difference($a, $b) {
+		return abs($a - $b);
 	}
 
 	/**
@@ -466,8 +466,8 @@ 
 	 * @param string $name Property to get.
 	 * @return mixed Property.
 	 */
-	public function __get( $name ) {
-		if ( in_array( $name, $this->compat_fields ) ) {
+	public function __get($name) {
+		if (in_array($name, $this->compat_fields)) {
 			return $this->$name;
 		}
 	}
@@ -482,8 +482,8 @@ 
 	 * @param mixed  $value Property value.
 	 * @return mixed Newly-set property.
 	 */
-	public function __set( $name, $value ) {
-		if ( in_array( $name, $this->compat_fields ) ) {
+	public function __set($name, $value) {
+		if (in_array($name, $this->compat_fields)) {
 			return $this->$name = $value;
 		}
 	}
@@ -497,9 +497,9 @@ 
 	 * @param string $name Property to check if set.
 	 * @return bool Whether the property is set.
 	 */
-	public function __isset( $name ) {
-		if ( in_array( $name, $this->compat_fields ) ) {
-			return isset( $this->$name );
+	public function __isset($name) {
+		if (in_array($name, $this->compat_fields)) {
+			return isset($this->$name);
 		}
 	}
 
@@ -511,9 +511,9 @@ 
 	 *
 	 * @param string $name Property to unset.
 	 */
-	public function __unset( $name ) {
-		if ( in_array( $name, $this->compat_fields ) ) {
-			unset( $this->$name );
+	public function __unset($name) {
+		if (in_array($name, $this->compat_fields)) {
+			unset($this->$name);
 		}
 	}
 }
@@ -536,8 +536,8 @@ 
 	 */
 	public function _splitOnWords($string, $newlineEscape = "\n") {
 		$string = str_replace("\0", '', $string);
-		$words  = preg_split( '/([^\w])/u', $string, -1, PREG_SPLIT_DELIM_CAPTURE );
-		$words  = str_replace( "\n", $newlineEscape, $words );
+		$words  = preg_split('/([^\w])/u', $string, -1, PREG_SPLIT_DELIM_CAPTURE);
+		$words  = str_replace("\n", $newlineEscape, $words);
 		return $words;
 	}
 

Indentation +1 added lines, -1 removed lines

@@ -169,7 +169,7 @@
 				 *
 				 * @param String $processed_line The processed diffed line.
 				 * @param String $line           The unprocessed diffed line.
-		 		 * @param string null            The line context. Values are 'added', 'deleted' or 'unchanged'.
+				 * @param string null            The line context. Values are 'added', 'deleted' or 'unchanged'.
 				 */
 				$line = apply_filters( 'process_text_diff_html', $processed_line, $line, 'added' );
 			}

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.
  */

Spacing +23 added lines, -23 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,10 +78,10 @@ 
 $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)) {
@@ -90,14 +90,14 @@ 
 	exit;
 }
 
-if ( !empty($tb_url) && !empty($title) ) {
-	header('Content-Type: text/xml; charset=' . get_option('blog_charset') );
+if ( ! empty($tb_url) && ! empty($title)) {
+	header('Content-Type: text/xml; charset='.get_option('blog_charset'));
 
-	if ( !pings_open($tb_id) )
+	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;
@@ -106,8 +106,8 @@ 
 	$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 )
+	$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');
@@ -122,6 +122,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.
@@ -93,8 +97,9 @@ 
 if ( !empty($tb_url) && !empty($title) ) {
 	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, '…' );
@@ -107,8 +112,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;

tools/i18n/not-gettexted.php

Doc Comments +12 added lines

@@ -51,6 +51,9 @@ 
 		return '';
 	}
 
+	/**
+	 * @param string $dir
+	 */
 	function list_php_files($dir) {
 		$files = array();
 		$items = scandir( $dir );
@@ -67,16 +70,25 @@ 
 	}
 
 
+	/**
+	 * @param string $global_array_name
+	 */
 	function make_string_aggregator($global_array_name, $filename) {
 		$a = $global_array_name;
 		return create_function('$string, $comment_id, $line_number', 'global $'.$a.'; $'.$a.'[] = array($string, $comment_id, '.var_export($filename, true).', $line_number);');
 	}
 
+	/**
+	 * @param string $global_mo_name
+	 */
 	function make_mo_replacer($global_mo_name) {
 		$m = $global_mo_name;
 		return create_function('$token, $string', 'global $'.$m.'; return var_export($'.$m.'->translate($string), true);');
 	}
 
+	/**
+	 * @param string $register_action
+	 */
 	function walk_tokens(&$tokens, $string_action, $other_action, $register_action=null) {
 
 		$current_comment_id = '';

Indentation +2 added lines, -2 removed lines

@@ -8,9 +8,9 @@
  */
 // see: http://php.net/tokenizer
 if ( ! defined( 'T_ML_COMMENT' ) )
-	    define( 'T_ML_COMMENT', T_COMMENT );
+		define( 'T_ML_COMMENT', T_COMMENT );
 else
-	    define( 'T_DOC_COMMENT', T_ML_COMMENT );
+		define( 'T_DOC_COMMENT', T_ML_COMMENT );
 
 $pomo = dirname( dirname( dirname( __FILE__ ) ) ) . '/src/wp-includes/pomo';
 require_once "$pomo/po.php";

Spacing +24 added lines, -24 removed lines

@@ -7,12 +7,12 @@ 
  * @subpackage tools
  */
 // see: http://php.net/tokenizer
-if ( ! defined( 'T_ML_COMMENT' ) )
-	    define( 'T_ML_COMMENT', T_COMMENT );
+if ( ! defined('T_ML_COMMENT'))
+	    define('T_ML_COMMENT', T_COMMENT);
 else
-	    define( 'T_DOC_COMMENT', T_ML_COMMENT );
+	    define('T_DOC_COMMENT', T_ML_COMMENT);
 
-$pomo = dirname( dirname( dirname( __FILE__ ) ) ) . '/src/wp-includes/pomo';
+$pomo = dirname(dirname(dirname(__FILE__))).'/src/wp-includes/pomo';
 require_once "$pomo/po.php";
 require_once "$pomo/mo.php";
 
@@ -26,7 +26,7 @@ 
 	var $STAGE_WHITESPACE_AFTER = 4;
 	var $STAGE_END_COMMENT = 4;
 
-	var $commands = array('extract' => 'command_extract', 'replace' => 'command_replace' );
+	var $commands = array('extract' => 'command_extract', 'replace' => 'command_replace');
 
 
 	function logmsg() {
@@ -34,8 +34,8 @@ 
 		if ($this->enable_logging) error_log(implode(' ', $args));
 	}
 
-	function stderr($msg, $nl=true) {
-		fwrite(STDERR, $msg.($nl? "\n" : ""));
+	function stderr($msg, $nl = true) {
+		fwrite(STDERR, $msg.($nl ? "\n" : ""));
 	}
 
 	function cli_die($msg) {
@@ -43,19 +43,19 @@ 
 		exit(1);
 	}
 
-	function unchanged_token($token, $s='') {
-		return is_array($token)? $token[1] : $token;
+	function unchanged_token($token, $s = '') {
+		return is_array($token) ? $token[1] : $token;
 	}
 
-	function ignore_token($token, $s='') {
+	function ignore_token($token, $s = '') {
 		return '';
 	}
 
 	function list_php_files($dir) {
 		$files = array();
-		$items = scandir( $dir );
-		foreach ( (array) $items as $item ) {
-			$full_item = $dir . '/' . $item;
+		$items = scandir($dir);
+		foreach ((array) $items as $item) {
+			$full_item = $dir.'/'.$item;
 			if ('.' == $item || '..' == $item)
 				continue;
 			if ('.php' == substr($item, -4))
@@ -77,7 +77,7 @@ 
 		return create_function('$token, $string', 'global $'.$m.'; return var_export($'.$m.'->translate($string), true);');
 	}
 
-	function walk_tokens(&$tokens, $string_action, $other_action, $register_action=null) {
+	function walk_tokens(&$tokens, $string_action, $other_action, $register_action = null) {
 
 		$current_comment_id = '';
 		$current_string = '';
@@ -86,7 +86,7 @@ 
 		$result = '';
 		$line = 1;
 
-		foreach($tokens as $token) {
+		foreach ($tokens as $token) {
 			if (is_array($token)) {
 				list($id, $text) = $token;
 				$line += substr_count($text, "\n");
@@ -102,7 +102,7 @@ 
 						$stage = $this->STAGE_END_COMMENT;
 						$this->logmsg('end comment', $current_comment_id);
 						$result .= call_user_func($other_action, $token);
-						if (!is_null($register_action)) call_user_func($register_action, $current_string, $current_comment_id, $current_string_line);
+						if ( ! is_null($register_action)) call_user_func($register_action, $current_string, $current_comment_id, $current_string_line);
 						continue;
 					}
 				} else if (T_CONSTANT_ENCAPSED_STRING == $id) {
@@ -149,21 +149,21 @@ 
 		$global_name = '__entries_'.mt_rand(1, 1000);
 		$GLOBALS[$global_name] = array();
 
-		foreach($filenames as $filename) {
+		foreach ($filenames as $filename) {
 			$tokens = token_get_all(file_get_contents($filename));
 			$aggregator = $this->make_string_aggregator($global_name, $filename);
 			$this->walk_tokens($tokens, array($this, 'ignore_token'), array($this, 'ignore_token'), $aggregator);
 		}
 
-		$potf = '-' == $pot_filename? STDOUT : @fopen($pot_filename, 'a');
+		$potf = '-' == $pot_filename ? STDOUT : @fopen($pot_filename, 'a');
 		if (false === $potf) {
 			$this->cli_die("Couldn't open pot file: $pot_filename");
 		}
 
-		foreach($GLOBALS[$global_name] as $item) {
+		foreach ($GLOBALS[$global_name] as $item) {
 			@list($string, $comment_id, $filename, $line_number) = $item;
-			$filename = isset($filename)? preg_replace('|^\./|', '', $filename) : '';
-			$ref_line_number = isset($line_number)? ":$line_number" : '';
+			$filename = isset($filename) ? preg_replace('|^\./|', '', $filename) : '';
+			$ref_line_number = isset($line_number) ? ":$line_number" : '';
 			$args = array(
 				'singular' => $string,
 				'extracted_comments' => "Not gettexted string $comment_id",
@@ -192,9 +192,9 @@ 
 		if (false === $res) {
 			$this->cli_die("Couldn't read MO file '$mo_filename'!");
 		}
-		foreach($filenames as $filename) {
+		foreach ($filenames as $filename) {
 			$source = file_get_contents($filename);
-			if ( strlen($source) > 150000 ) continue;
+			if (strlen($source) > 150000) continue;
 			$tokens = token_get_all($source);
 			$new_file = $this->walk_tokens($tokens, $replacer, array($this, 'unchanged_token'));
 			$f = fopen($filename, 'w');
@@ -214,7 +214,7 @@ 
 
 	function cli() {
 		global $argv, $commands;
-		if (count($argv) < 4 || !in_array($argv[1], array_keys($this->commands))) {
+		if (count($argv) < 4 || ! in_array($argv[1], array_keys($this->commands))) {
 			$this->usage();
 			exit(1);
 		}

Braces +34 added lines, -20 removed lines

@@ -7,10 +7,11 @@ 
  * @subpackage tools
  */
 // see: http://php.net/tokenizer
-if ( ! defined( 'T_ML_COMMENT' ) )
+if ( ! defined( 'T_ML_COMMENT' ) ) {
 	    define( 'T_ML_COMMENT', T_COMMENT );
-else
+} else {
 	    define( 'T_DOC_COMMENT', T_ML_COMMENT );
+}
 
 $pomo = dirname( dirname( dirname( __FILE__ ) ) ) . '/src/wp-includes/pomo';
 require_once "$pomo/po.php";
@@ -31,7 +32,9 @@ 
 
 	function logmsg() {
 		$args = func_get_args();
-		if ($this->enable_logging) error_log(implode(' ', $args));
+		if ($this->enable_logging) {
+			error_log(implode(' ', $args));
+		}
 	}
 
 	function stderr($msg, $nl=true) {
@@ -56,12 +59,15 @@ 
 		$items = scandir( $dir );
 		foreach ( (array) $items as $item ) {
 			$full_item = $dir . '/' . $item;
-			if ('.' == $item || '..' == $item)
-				continue;
-			if ('.php' == substr($item, -4))
-				$files[] = $full_item;
-			if (is_dir($full_item))
-				$files += array_merge($files, NotGettexted::list_php_files($full_item, $files));
+			if ('.' == $item || '..' == $item) {
+							continue;
+			}
+			if ('.php' == substr($item, -4)) {
+							$files[] = $full_item;
+			}
+			if (is_dir($full_item)) {
+							$files += array_merge($files, NotGettexted::list_php_files($full_item, $files));
+			}
 		}
 		return $files;
 	}
@@ -102,7 +108,9 @@ 
 						$stage = $this->STAGE_END_COMMENT;
 						$this->logmsg('end comment', $current_comment_id);
 						$result .= call_user_func($other_action, $token);
-						if (!is_null($register_action)) call_user_func($register_action, $current_string, $current_comment_id, $current_string_line);
+						if (!is_null($register_action)) {
+							call_user_func($register_action, $current_string, $current_comment_id, $current_string_line);
+						}
 						continue;
 					}
 				} else if (T_CONSTANT_ENCAPSED_STRING == $id) {
@@ -141,10 +149,11 @@ 
 	function command_extract() {
 		$args = func_get_args();
 		$pot_filename = $args[0];
-		if (isset($args[1]) && is_array($args[1]))
-			$filenames = $args[1];
-		else
-			$filenames = array_slice($args, 1);
+		if (isset($args[1]) && is_array($args[1])) {
+					$filenames = $args[1];
+		} else {
+					$filenames = array_slice($args, 1);
+		}
 
 		$global_name = '__entries_'.mt_rand(1, 1000);
 		$GLOBALS[$global_name] = array();
@@ -172,17 +181,20 @@ 
 			$entry = new Translation_Entry($args);
 			fwrite($potf, "\n".PO::export_entry($entry)."\n");
 		}
-		if ('-' != $pot_filename) fclose($potf);
+		if ('-' != $pot_filename) {
+			fclose($potf);
+		}
 		return true;
 	}
 
 	function command_replace() {
 		$args = func_get_args();
 		$mo_filename = $args[0];
-		if (isset($args[1]) && is_array($args[1]))
-			$filenames = $args[1];
-		else
-			$filenames = array_slice($args, 1);
+		if (isset($args[1]) && is_array($args[1])) {
+					$filenames = $args[1];
+		} else {
+					$filenames = array_slice($args, 1);
+		}
 
 		$global_name = '__mo_'.mt_rand(1, 1000);
 		$GLOBALS[$global_name] = new MO();
@@ -194,7 +206,9 @@ 
 		}
 		foreach($filenames as $filename) {
 			$source = file_get_contents($filename);
-			if ( strlen($source) > 150000 ) continue;
+			if ( strlen($source) > 150000 ) {
+				continue;
+			}
 			$tokens = token_get_all($source);
 			$new_file = $this->walk_tokens($tokens, $replacer, array($this, 'unchanged_token'));
 			$f = fopen($filename, 'w');

tools/i18n/pot-ext-meta.php

Doc Comments +3 added lines

@@ -49,6 +49,9 @@
 		return $pot;
 	}
 
+	/**
+	 * @param string[] $headers
+	 */
 	function append( $ext_filename, $pot_filename, $headers = null ) {
 		if ( $headers )
 			$this->headers = (array) $headers;

Spacing +11 added lines, -11 removed lines

@@ -7,9 +7,9 @@ 
  * @subpackage tools
  */
 
-$pomo = dirname( dirname( dirname( __FILE__ ) ) ) . '/src/wp-includes/pomo';
+$pomo = dirname(dirname(dirname(__FILE__))).'/src/wp-includes/pomo';
 require_once "$pomo/po.php";
-require_once dirname( __FILE__ ) . '/makepot.php';
+require_once dirname(__FILE__).'/makepot.php';
 
 class PotExtMeta {
 
@@ -36,9 +36,9 @@ 
 		$source = $makepot->get_first_lines($ext_filename);
 		$pot = '';
 		$po = new PO;
-		foreach($this->headers as $header) {
+		foreach ($this->headers as $header) {
 			$string = $makepot->get_addon_header($header, $source);
-			if (!$string) continue;
+			if ( ! $string) continue;
 			$args = array(
 				'singular' => $string,
 				'extracted_comments' => $header.' of the plugin/theme',
@@ -49,16 +49,16 @@ 
 		return $pot;
 	}
 
-	function append( $ext_filename, $pot_filename, $headers = null ) {
-		if ( $headers )
+	function append($ext_filename, $pot_filename, $headers = null) {
+		if ($headers)
 			$this->headers = (array) $headers;
-		if ( is_dir( $ext_filename ) ) {
+		if (is_dir($ext_filename)) {
 			$pot = implode('', array_map(array($this, 'load_from_file'), glob("$ext_filename/*.php")));
 		} else {
 			$pot = $this->load_from_file($ext_filename);
 		}
-		$potf = '-' == $pot_filename? STDOUT : fopen($pot_filename, 'a');
-		if (!$potf) return false;
+		$potf = '-' == $pot_filename ? STDOUT : fopen($pot_filename, 'a');
+		if ( ! $potf) return false;
 		fwrite($potf, $pot);
 		if ('-' != $pot_filename) fclose($potf);
 		return true;
@@ -69,10 +69,10 @@ 
 if ($included_files[0] == __FILE__) {
 	ini_set('display_errors', 1);
 	$potextmeta = new PotExtMeta;
-	if (!isset($argv[1])) {
+	if ( ! isset($argv[1])) {
 		$potextmeta->usage();
 	}
-	$potextmeta->append( $argv[1], isset( $argv[2] ) ? $argv[2] : '-', isset( $argv[3] ) ? $argv[3] : null );
+	$potextmeta->append($argv[1], isset($argv[2]) ? $argv[2] : '-', isset($argv[3]) ? $argv[3] : null);
 }
 
 ?>

Braces +12 added lines, -5 removed lines

@@ -38,7 +38,9 @@ 
 		$po = new PO;
 		foreach($this->headers as $header) {
 			$string = $makepot->get_addon_header($header, $source);
-			if (!$string) continue;
+			if (!$string) {
+				continue;
+			}
 			$args = array(
 				'singular' => $string,
 				'extracted_comments' => $header.' of the plugin/theme',
@@ -50,17 +52,22 @@ 
 	}
 
 	function append( $ext_filename, $pot_filename, $headers = null ) {
-		if ( $headers )
-			$this->headers = (array) $headers;
+		if ( $headers ) {
+					$this->headers = (array) $headers;
+		}
 		if ( is_dir( $ext_filename ) ) {
 			$pot = implode('', array_map(array($this, 'load_from_file'), glob("$ext_filename/*.php")));
 		} else {
 			$pot = $this->load_from_file($ext_filename);
 		}
 		$potf = '-' == $pot_filename? STDOUT : fopen($pot_filename, 'a');
-		if (!$potf) return false;
+		if (!$potf) {
+			return false;
+		}
 		fwrite($potf, $pot);
-		if ('-' != $pot_filename) fclose($potf);
+		if ('-' != $pot_filename) {
+			fclose($potf);
+		}
 		return true;
 	}
 }

tools/i18n/t/data/not-gettexted-0.php

Braces +5 added lines, -2 removed lines

@@ -2,8 +2,11 @@
 
 if (! isset($wp_did_header)):
 if ( !file_exists( dirname(__FILE__) . '/wp-config.php') ) {
-	if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false) $path = '';
-	else $path = 'wp-admin/';
+	if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false) {
+		$path = '';
+	} else {
+		$path = 'wp-admin/';
+	}
 
 	require_once( dirname(__FILE__) . '/wp-includes/classes.php');
 	require_once( dirname(__FILE__) . '/wp-includes/functions.php');

Spacing +8 added lines, -8 removed lines

@@ -1,23 +1,23 @@
 <?php
 
-if (! isset($wp_did_header)):
-if ( !file_exists( dirname(__FILE__) . '/wp-config.php') ) {
+if ( ! isset($wp_did_header)):
+if ( ! file_exists(dirname(__FILE__).'/wp-config.php')) {
 	if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false) $path = '';
 	else $path = 'wp-admin/';
 
-	require_once( dirname(__FILE__) . '/wp-includes/classes.php');
-	require_once( dirname(__FILE__) . '/wp-includes/functions.php');
-	require_once( dirname(__FILE__) . '/wp-includes/plugin.php');
-	wp_die( sprintf(/*WP_I18N_CONFIG*/" There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='https://codex.wordpress.org/Editing_wp-config.php'>We got it</a>. You can create a <code>wp-config.php</code> file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file.</p><p><a href='%s' class='button'>Create a Configuration File</a>" /*/WP_I18N_CONFIG*/, $path.'setup-config.php'), /*WP_I18N_ERROR*/ "WordPress &rsaquo; Error" /*/WP_I18N_ERROR*/);
+	require_once(dirname(__FILE__).'/wp-includes/classes.php');
+	require_once(dirname(__FILE__).'/wp-includes/functions.php');
+	require_once(dirname(__FILE__).'/wp-includes/plugin.php');
+	wp_die(sprintf(/*WP_I18N_CONFIG*/" There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='https://codex.wordpress.org/Editing_wp-config.php'>We got it</a>. You can create a <code>wp-config.php</code> file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file.</p><p><a href='%s' class='button'>Create a Configuration File</a>" /*/WP_I18N_CONFIG*/, $path.'setup-config.php'), /*WP_I18N_ERROR*/ "WordPress &rsaquo; Error" /*/WP_I18N_ERROR*/);
 }
 
 $wp_did_header = true;
 
-require_once( dirname(__FILE__) . '/wp-config.php');
+require_once(dirname(__FILE__).'/wp-config.php');
 
 wp();
 
-require_once(ABSPATH . WPINC . '/template-loader.php');
+require_once(ABSPATH.WPINC.'/template-loader.php');
 
 endif;
 

tools/i18n/t/NotGettextedTest.php

Spacing +14 added lines, -14 removed lines

@@ -5,8 +5,8 @@ 
  * @package wordpress-i18n
  * @subpackage tools
  */
-error_reporting( E_ALL );
-require_once dirname( dirname( __FILE__ ) ) . '/not-gettexted.php';
+error_reporting(E_ALL);
+require_once dirname(dirname(__FILE__)).'/not-gettexted.php';
 
 class NotGettextedTest extends PHPUnit_Framework_TestCase {
 
@@ -16,10 +16,10 @@ 
 
 	function test_make_string_aggregator() {
 		global $baba;
-		$f = $this->ng->make_string_aggregator( 'baba', 'baba.php' );
-		call_user_func( $f, 'x', 'y', 'z' );
-		call_user_func( $f, 'a', 'b', 'c' );
-		$this->assertEquals( array( array( 'x', 'y', 'baba.php', 'z'), array( 'a', 'b', 'baba.php', 'c' ) ), $baba );
+		$f = $this->ng->make_string_aggregator('baba', 'baba.php');
+		call_user_func($f, 'x', 'y', 'z');
+		call_user_func($f, 'a', 'b', 'c');
+		$this->assertEquals(array(array('x', 'y', 'baba.php', 'z'), array('a', 'b', 'baba.php', 'c')), $baba);
 	}
 
 	function test_walk() {
@@ -30,17 +30,17 @@ 
 	if ($x == "18181") { wp_die(sprintf(/*WP_I18N_DIE*/\'We died %d times!\'/*WP_I18N_DIE*/)); }
 ?>';
 		$tokens = token_get_all($code);
-		$this->assertEquals( '', $this->ng->walk_tokens( $tokens, array($this->ng, 'ignore_token'), array($this->ng, 'ignore_token') ) );
-		$this->assertEquals( '"yes"\'We died %d times!\'', $this->ng->walk_tokens( $tokens, array($this->ng, 'unchanged_token'), array($this->ng, 'ignore_token') ) );
-		$this->assertEquals( $code, $this->ng->walk_tokens( $tokens, array($this->ng, 'unchanged_token'), array($this->ng, 'unchanged_token') ) );
-		$this->assertEquals( $code, $this->ng->walk_tokens( $tokens, array($this->ng, 'unchanged_token'), array($this->ng, 'unchanged_token') ) );
+		$this->assertEquals('', $this->ng->walk_tokens($tokens, array($this->ng, 'ignore_token'), array($this->ng, 'ignore_token')));
+		$this->assertEquals('"yes"\'We died %d times!\'', $this->ng->walk_tokens($tokens, array($this->ng, 'unchanged_token'), array($this->ng, 'ignore_token')));
+		$this->assertEquals($code, $this->ng->walk_tokens($tokens, array($this->ng, 'unchanged_token'), array($this->ng, 'unchanged_token')));
+		$this->assertEquals($code, $this->ng->walk_tokens($tokens, array($this->ng, 'unchanged_token'), array($this->ng, 'unchanged_token')));
 	}
 
 	function test_replace() {
 		# copy to a new file, so that we don't corrupt the old one
-		copy( 'data/not-gettexted-0.php', 'data/not-gettexted-0-work.php' );
-		$this->ng->command_replace( 'data/not-gettexted-0.mo', 'data/not-gettexted-0-work.php' );
-		$this->assertEquals( file_get_contents( 'data/not-gettexted-0-result.php' ), file_get_contents( 'data/not-gettexted-0-work.php' ) );
-		unlink( 'data/not-gettexted-0-work.php' );
+		copy('data/not-gettexted-0.php', 'data/not-gettexted-0-work.php');
+		$this->ng->command_replace('data/not-gettexted-0.mo', 'data/not-gettexted-0-work.php');
+		$this->assertEquals(file_get_contents('data/not-gettexted-0-result.php'), file_get_contents('data/not-gettexted-0-work.php'));
+		unlink('data/not-gettexted-0-work.php');
 	}
 }

src/wp-blog-header.php

Spacing +3 added lines, -3 removed lines

@@ -5,14 +5,14 @@
  * @package WordPress
  */
 
-if ( !isset($wp_did_header) ) {
+if ( ! isset($wp_did_header)) {
 
 	$wp_did_header = true;
 
-	require_once( dirname(__FILE__) . '/wp-load.php' );
+	require_once(dirname(__FILE__).'/wp-load.php');
 
 	wp();
 
-	require_once( ABSPATH . WPINC . '/template-loader.php' );
+	require_once(ABSPATH.WPINC.'/template-loader.php');
 
 }