Add diffing strategy selection

Author: jschroed91

lib/Caxy/HtmlDiff/AbstractDiff.php

@@ -4,6 +4,9 @@
 
 abstract class AbstractDiff
 {
+    const STRATEGY_MATCHING = 'matching';
+    const STRATEGY_RELATIVE = 'relative';
+
     public static $defaultSpecialCaseTags = array('strong', 'b', 'i', 'big', 'small', 'u', 'sub', 'sup', 'strike', 's', 'p');
     public static $defaultSpecialCaseChars = array('.', ',', '(', ')', '\'');
     public static $defaultGroupDiffs = true;
@@ -22,6 +25,8 @@ abstract class AbstractDiff
     protected $matchThreshold = 80;
     protected $debug = false;
 
+    protected $strategy = self::STRATEGY_MATCHING;
+
     public function __construct($oldText, $newText, $encoding = 'UTF-8', $specialCaseTags = null, $groupDiffs = null)
     {
         if ($specialCaseTags === null) {
@@ -41,6 +46,18 @@ public function __construct($oldText, $newText, $encoding = 'UTF-8', $specialCas
         $this->setSpecialCaseChars(static::$defaultSpecialCaseChars);
     }
 
+    public function setStrategy($strategy)
+    {
+        $this->strategy = $strategy;
+
+        return $this;
+    }
+
+    public function getStrategy()
+    {
+        return $this->strategy;
+    }
+
     public function setDebug($debug)
     {
         $this->debug = $debug;

lib/Caxy/HtmlDiff/HtmlDiff.php

@@ -265,6 +265,7 @@ protected function diffTables($oldText, $newText)
     {
         $diff = new TableDiff($oldText, $newText, $this->encoding, $this->specialCaseTags, $this->groupDiffs);
         $diff->setMatchThreshold($this->matchThreshold);
+        $diff->setStrategy($this->strategy);
 
         return $diff->build();
     }

lib/Caxy/HtmlDiff/Table/TableDiff.php

@@ -16,9 +16,6 @@
  */
 class TableDiff extends AbstractDiff
 {
-    const STRATEGY_MATCHING = 'matching';
-    const STRATEGY_RELATIVE = 'relative';
-
     /**
      * @var null|Table
      */
@@ -69,18 +66,6 @@ public function __construct($oldText, $newText, $encoding, $specialCaseTags, $gr
         $this->purifier = new \HTMLPurifier($config);
     }
 
-    public function setStrategy($strategy)
-    {
-        $this->strategy = $strategy;
-
-        return $this;
-    }
-
-    public function getStrategy()
-    {
-        return $this->strategy;
-    }
-
     public function build()
     {
         $this->buildTableDoms();
@@ -185,26 +170,18 @@ protected function diffTableContent()
                     $newMatchData[$newIndex] = array();
                 }
 
-                $oldText = $oldRow->getInnerHtml();
-                $newText = $newRow->getInnerHtml();
-
                 // similar_text
-//                $percentage = null;
-//                similar_text($oldText, $newText, $percentage);
                 $percentage = $this->getMatchPercentage($oldRow, $newRow);
 
                 $oldMatchData[$oldIndex][$newIndex] = $percentage;
                 $newMatchData[$newIndex][$oldIndex] = $percentage;
             }
         }
 
-        $matches = $this->getRowMatches($oldMatchData, $newMatchData);
-
-        addDebugOutput($matches, __METHOD__);
-
         // new solution for diffing rows
         switch ($this->strategy) {
             case self::STRATEGY_MATCHING:
+                $matches = $this->getRowMatches($oldMatchData, $newMatchData);
                 $this->diffTableRowsWithMatches($oldRows, $newRows, $matches);
                 break;
 
@@ -213,6 +190,7 @@ protected function diffTableContent()
                 break;
 
             default:
+                $matches = $this->getRowMatches($oldMatchData, $newMatchData);
                 $this->diffTableRowsWithMatches($oldRows, $newRows, $matches);
                 break;
         }
@@ -309,7 +287,6 @@ protected function processEqualOperation($operation, $oldRows, $newRows, &$appli
 
         foreach ($targetNewRows as $index => $newRow) {
             if (!isset($targetOldRows[$index])) {
-                addDebugOutput('failed finding matchign row', __METHOD__);
                 continue;
             }
 
@@ -433,7 +410,7 @@ protected function diffTableRows($oldRows, $newRows, $oldMatchData)
 
                 if (false !== $otherMatchBetter && $newCount > $oldCount && $difference > 0) {
                     // insert row as new
-                    $this->diffAndAppendRows(null, $row, $appliedRowSpans, true);
+                    $this->diffAndAppendRows(null, $row, $appliedRowSpans);
                     $difference--;
 
                     continue;