Fix #58 - Side by side diff shows empty diff

JBlond · Aug 5, 2020 · 369b146 · 369b146
1 parent 02695d5
commit 369b146
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/example/example.php b/example/example.php
@@ -11,8 +11,8 @@
 require '../vendor/autoload.php';
 
 // Include two sample files for comparison.
-$sampleA = file_get_contents(dirname(__FILE__) . '/a.txt');
-$sampleB = file_get_contents(dirname(__FILE__) . '/b.txt');
+$sampleA = file_get_contents(dirname(__FILE__) . '/c.txt');
+$sampleB = file_get_contents(dirname(__FILE__) . '/d.txt');
 
 // Options for generating the diff.
 $customOptions = [

diff --git a/lib/jblond/Diff/Renderer/Html/SideBySide.php b/lib/jblond/Diff/Renderer/Html/SideBySide.php
@@ -213,6 +213,9 @@ public function generateLinesReplace(array $changes): string
                     $changedLine = $changes['changed']['lines'][$lineNo];
                 }
 
+                $line        = str_replace(["\0", "\1"], $this->options['deleteMarkers'], $line);
+                $changedLine = str_replace(["\0", "\1"], $this->options['insertMarkers'], $changedLine);
+
                 $html .= <<<HTML
 <tr>
     <th>$fromLine</th>
@@ -239,6 +242,9 @@ public function generateLinesReplace(array $changes): string
                 $line     = $changes['base']['lines'][$lineNo];
             }
 
+            $line        = str_replace(["\0", "\1"], $this->options['deleteMarkers'], $line);
+            $changedLine = str_replace(["\0", "\1"], $this->options['insertMarkers'], $changedLine);
+
             $html .= <<<HTML
 <tr>
     <th>$fromLine</th>