Exemple #1
0
 /**
  * Computes diff between 3 sequences of strings.
  *
  * @param array $orig    The original lines to use.
  * @param array $final1  The first version to compare to.
  * @param array $final2  The second version to compare to.
  */
 function Text_Diff3($orig, $final1, $final2)
 {
     if (extension_loaded('xdiff')) {
         $engine = new Text_Diff_Engine_xdiff();
     } else {
         $engine = new Text_Diff_Engine_native();
     }
     $this->_edits = $this->_diff3($engine->diff($orig, $final1), $engine->diff($orig, $final2));
 }
Exemple #2
0
 /**
  * Computes diffs between sequences 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.
  */
 function Text_Diff($from_lines, $to_lines)
 {
     array_walk($from_lines, array($this, '_trimNewlines'));
     array_walk($to_lines, array($this, '_trimNewlines'));
     if (extension_loaded('xdiff')) {
         $engine = new Text_Diff_Engine_xdiff();
     } else {
         $engine = new Text_Diff_Engine_native();
     }
     $this->_edits = $engine->diff($from_lines, $to_lines);
 }
Exemple #3
0
 /**
  * Computes diff between 3 sequences of strings.
  *
  * @param array $orig    The original lines to use.
  * @param array $final1  The first version to compare to.
  * @param array $final2  The second version to compare to.
  */
 function Text_Diff3($orig, $final1, $final2)
 {
     if (extension_loaded('xdiff')) {
         require_once 'Text/Diff/Engine/xdiff.php';
         /*noLibHook*/
         $engine = new Text_Diff_Engine_xdiff();
     } else {
         require_once 'Text/Diff/Engine/native.php';
         /*noLibHook*/
         $engine = new Text_Diff_Engine_native();
     }
     $this->_edits = $this->_diff3($engine->diff($orig, $final1), $engine->diff($orig, $final2));
 }
Exemple #4
0
 /**
  * Computes diffs between sequences of strings.
  *
  * @param string $engine     Name of the diffing engine to use.  'auto'
  *                           will automatically select the best.
  * @param array $params      Parameters to pass to the diffing engine.
  *                           Normally an array of two arrays, each
  *                           containing the lines from a file.
  */
 function Text_Diff($from, $to)
 {
     require_once 'native.php';
     $native = new Text_Diff_Engine_native();
     $this->_edits = $native->diff($from, $to);
 }
Exemple #5
0
 /**
  * Computes diff between 3 sequences of strings.
  *
  * @param array $orig	 The original lines to use.
  * @param array $final1  The first version to compare to.
  * @param array $final2  The second version to compare to.
  */
 function Text_Diff3($orig, $final1, $final2)
 {
     $engine = new Text_Diff_Engine_native();
     $this->_edits = $this->_diff3($engine->diff($orig, $final1), $engine->diff($orig, $final2));
 }
Exemple #6
0
 /**
  * Computes diff between 3 sequences of strings.
  *
  * @param array $orig    The original lines to use.
  * @param array $final1  The first version to compare to.
  * @param array $final2  The second version to compare to.
  */
 function Text_Diff3($orig, $final1, $final2)
 {
     require_once 'merge_native.php';
     $engine = new Text_Diff_Engine_native();
     $this->_edits = $this->_diff3($engine->diff($orig, $final1), $engine->diff($orig, $final2));
 }