Code tidy

Signed-off-by: Jack Cherng <[email protected]>

Author: jfcherng

src/Renderer/Html/AbstractHtml.php

@@ -188,29 +188,48 @@ protected function getDefaultBlock(string $tag, int $i1, int $j1): array
     }
 
     /**
-     * Format a series of lines suitable for output in a HTML rendered diff.
-     * This involves replacing tab characters with spaces, making the HTML safe
-     * for output, ensuring that double spaces are replaced with   etc.
+     * Make a series of lines suitable for outputting in a HTML rendered diff.
      *
      * @param string[] $lines array of lines to format
      *
      * @return string[] array of the formatted lines
      */
     protected function formatLines(array $lines): array
     {
-        // glue all lines into a single string to get rid of multiple function calls later
-        // unnecessary, but should improve performance if there are many lines
-        $string = \implode(RendererConstant::IMPLODE_DELIMITER, $lines);
+        /**
+         * To prevent from invoking the same function calls for several times,
+         * we can glue lines into a string and call functions for one time.
+         * After that, we split the string back into lines.
+         */
+        return \explode(
+            RendererConstant::IMPLODE_DELIMITER,
+            $this->formatStringFromLines(\implode(
+                RendererConstant::IMPLODE_DELIMITER,
+                $lines
+            ))
+        );
+    }
 
+    /**
+     * Make a string suitable for outputting in a HTML rendered diff.
+     *
+     * This my involve replacing tab characters with spaces, making the HTML safe
+     * for output, ensuring that double spaces are replaced with   etc.
+     *
+     * @param string $string the string of imploded lines
+     *
+     * @return string the formatted string
+     */
+    protected function formatStringFromLines(string $string): string
+    {
         $string = $this->expandTabs($string, $this->options['tabSize']);
         $string = $this->htmlSafe($string);
 
         if ($this->options['spacesToNbsp']) {
             $string = $this->htmlFixSpaces($string);
         }
 
-        // split the string back to lines
-        return \explode(RendererConstant::IMPLODE_DELIMITER, $string);
+        return $string;
     }
 
     /**

src/Renderer/Html/Json.php

@@ -4,8 +4,6 @@
 
 namespace Jfcherng\Diff\Renderer\Html;
 
-use Jfcherng\Diff\Renderer\RendererConstant;
-
 /**
  * Json diff generator.
  */
@@ -37,15 +35,8 @@ public function render(): string
     /**
      * {@inheritdoc}
      */
-    protected function formatLines(array $lines): array
+    protected function formatStringFromLines(string $string): string
     {
-        // glue all lines into a single string to get rid of multiple function calls later
-        // unnecessary, but should improve performance if there are many lines
-        $string = \implode(RendererConstant::IMPLODE_DELIMITER, $lines);
-
-        $string = $this->htmlSafe($string);
-
-        // split the string back to lines
-        return \explode(RendererConstant::IMPLODE_DELIMITER, $string);
+        return $this->htmlSafe($string);
     }
 }