X-Git-Url: http://aleph1.co.uk/gitweb/?a=blobdiff_plain;f=web%2Fcore%2Flib%2FDrupal%2FComponent%2FDiff%2FDiff.php;h=289bab5f0e7c542822d52a11c1e0631aa9c59cdf;hb=0bf8d09d2542548982e81a441b1f16e75873a04f;hp=d9042bcca715b9838df20e07da27c3e829a12a9f;hpb=a2bd1bf0c2c1f1a17d188f4dc0726a45494cefae;p=yaffs-website diff --git a/web/core/lib/Drupal/Component/Diff/Diff.php b/web/core/lib/Drupal/Component/Diff/Diff.php index d9042bcca..289bab5f0 100644 --- a/web/core/lib/Drupal/Component/Diff/Diff.php +++ b/web/core/lib/Drupal/Component/Diff/Diff.php @@ -27,9 +27,11 @@ class Diff { * Constructor. * Computes diff between sequences of strings. * - * @param $from_lines array An array of strings. - * (Typically these are lines from a file.) - * @param $to_lines array An array of strings. + * @param array $from_lines + * An array of strings. + * (Typically these are lines from a file.) + * @param array $to_lines + * An array of strings. */ public function __construct($from_lines, $to_lines) { $eng = new DiffEngine(); @@ -44,8 +46,8 @@ class Diff { * * $diff = new Diff($lines1, $lines2); * $rev = $diff->reverse(); - * @return object A Diff object representing the inverse of the - * original diff. + * @return object + * A Diff object representing the inverse of the original diff. */ public function reverse() { $rev = $this; @@ -146,7 +148,6 @@ class Diff { trigger_error("Reversed closing doesn't match", E_USER_ERROR); } - $prevtype = 'none'; foreach ($this->edits as $edit) { if ( $prevtype == $edit->type ) {