enmi-conf.org: comparison wp/wp-includes/Text/Diff.php

equal deleted inserted replaced

-:34716fd837a4
+:be944660c56a
 /**
 * returns the number of new (added) lines in a given diff.
 *
 * @since Text_Diff 1.1.0
 *
-* @return integer The number of new lines
+* @return int The number of new lines
 */
 function countAddedLines()
 {
 $count = 0;
 foreach ($this->_edits as $edit) {
 /**
 * Returns the number of deleted (removed) lines in a given diff.
 *
 * @since Text_Diff 1.1.0
 *
-* @return integer The number of deleted lines
+* @return int The number of deleted lines
 */
 function countDeletedLines()
 {
 $count = 0;
 foreach ($this->_edits as $edit) {
 }
 /**
 * Checks for an empty diff.
 *
-* @return boolean  True if two sequences were identical.
+* @return bool True if two sequences were identical.
 */
 function isEmpty()
 {
 foreach ($this->_edits as $edit) {
 if (!is_a($edit, 'Text_Diff_Op_copy')) {
 /**
 * Computes the length of the Longest Common Subsequence (LCS).
 *
 * This is mostly for diagnostic purposes.
 *
-* @return integer  The length of the LCS.
+* @return int The length of the LCS.
 */
 function lcs()
 {
 $lcs = 0;
 foreach ($this->_edits as $edit) {
 /**
 * Removes trailing newlines from a line of text. This is meant to be used
 * with array_walk().
 *
 * @param string $line  The line to trim.
-* @param integer $key  The index of the line in the array. Not used.
+* @param int    $key   The index of the line in the array. Not used.
 */
 static function trimNewlines(&$line, $key)
 {
 $line = str_replace(array("\n", "\r"), '', $line);
 }
 /**
 * Determines the location of the system temporary directory.
-*
-* @static
 *
 * @access protected
 *
 * @return string  A directory name which can be used for temp files.
 *                 Returns false if one could not be found.
 */
-function _getTempDir()
+static function _getTempDir()
 {
 $tmp_locations = array('/tmp', '/var/tmp', 'c:\WUTemp', 'c:\temp',
 'c:\windows\temp', 'c:\winnt\temp');
 /* Try PHP's upload_tmp_dir directive. */
 trigger_error("Reversed final doesn't match", E_USER_ERROR);
 }
 $prevtype = null;
 foreach ($this->_edits as $edit) {
-if ($prevtype == get_class($edit)) {
+if ($edit instanceof $prevtype) {
 trigger_error("Edit sequence is non-optimal", E_USER_ERROR);
 }
 $prevtype = get_class($edit);
 }

changeset 18	be944660c56a
parent 7	cf61fcea0001
child 19	3d72ae0968f4