fix: OP_EQ lines are not escaped in Combined renderer

#33

Signed-off-by: Jack Cherng <jfcherng@gmail.com>

Author: jfcherng

src/Renderer/Html/Combined.php

@@ -126,6 +126,11 @@ protected function renderTableBlock(array $block): string
      */
     protected function renderTableBlockEqual(array $block): string
     {
+        $block['new']['lines'] = $this->customFormatLines(
+            $block['new']['lines'],
+            SequenceMatcher::OP_EQ
+        );
+
         $ret = '';
 
         // note that although we are in a OP_EQ situation,
@@ -476,14 +481,19 @@ function (array $matches) use (&$parts, $part, $ld, $rd): string {
      */
     protected function customFormatLines(array $lines, int $op): array
     {
-        $htmlClosures = $op === SequenceMatcher::OP_DEL
-            ? RendererConstant::HTML_CLOSURES_DEL
-            : RendererConstant::HTML_CLOSURES_INS;
+        static $closureMap = [
+            SequenceMatcher::OP_DEL => RendererConstant::HTML_CLOSURES_DEL,
+            SequenceMatcher::OP_INS => RendererConstant::HTML_CLOSURES_INS,
+        ];
 
         $lines = $this->formatLines($lines);
 
+        $htmlClosures = $closureMap[$op] ?? null;
+
         foreach ($lines as &$line) {
-            $line = \str_replace(RendererConstant::HTML_CLOSURES, $htmlClosures, $line);
+            if ($htmlClosures) {
+                $line = \str_replace(RendererConstant::HTML_CLOSURES, $htmlClosures, $line);
+            }
         }
 
         return $lines;

tests/Renderer/Html/CombinedTest.php

@@ -10,7 +10,7 @@
 /**
  * Test Combined.
  *
- * @coversNothing
+ * @covers \Jfcherng\Diff\Renderer\Html\Combined
  *
  * @internal
  */
@@ -19,8 +19,6 @@ final class CombinedTest extends TestCase
     /**
      * Test the internal HTML output formatting.
      *
-     * @covers \Jfcherng\Diff\Renderer\Html\Combined
-     *
      * @see https://github.com/jfcherng/php-diff/issues/30
      */
     public function testHtmlFormatting(): void
@@ -31,4 +29,22 @@ public function testHtmlFormatting(): void
         /** @todo PHPUnit 9, static::assertStringNotContainsString() */
         static::assertThat($result, static::logicalNot(static::stringContains(';')));
     }
+
+    /**
+     * Test HTML escape for diff output.
+     *
+     * @see https://github.com/jfcherng/php-diff/issues/33
+     */
+    public function testHtmlEscapeForOpEq(): void
+    {
+        $result = DiffHelper::calculate(
+            "<tag>three</tag>\n<tag>four</tag>\n",
+            "one\n<tag>two</tag>\n<tag>three</tag>\n",
+            'Combined'
+        );
+
+        /** @todo PHPUnit 9, static::assertStringNotContainsString() */
+        static::assertThat($result, static::logicalNot(static::stringContains('<tag>')));
+        static::assertThat($result, static::logicalNot(static::stringContains('</tag>')));
+    }
 }