/**
* 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.
*/
function __construct($from_lines, $to_lines)
{
$eng = new _DiffEngine();
$this->edits = $eng->diff($from_lines, $to_lines);
// $this->_check($from_lines, $to_lines);
}
/**
* 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.
*/
public function Diff($from_lines, $to_lines)
{
$eng = new _DiffEngine();
$this->edits = $eng->diff($from_lines, $to_lines);
//$this->_check($from_lines, $to_lines);
}
/**
* 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.
*/
function Diff($from_lines, $to_lines)
{
$eng = new _DiffEngine();
$this->edits = $eng->diff($from_lines, $to_lines);
}
function Diff3($orig, $final1, $final2)
{
$eng = new _DiffEngine();
$this->ConflictingBlocks = 0;
//Conflict counter
$this->blocks = $this->__diff3($eng->diff($orig, $final1), $eng->diff($orig, $final2));
}
/**
* 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 __construct($orig, $final1, $final2)
{
$engine = new _DiffEngine();
$this->_edits = $this->_diff3($engine->diff($orig, $final1), $engine->diff($orig, $final2));
}
