Tidy codes

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

Author: jfcherng

src/Renderer/AbstractRenderer.php

@@ -154,24 +154,13 @@ final public function renderArray(array $differArray): string
      * @param Differ $differ the differ object
      */
     abstract protected function renderWoker(Differ $differ): string;
-    
+
     /**
-     * The worker for array render.
+     * The real worker for self::renderArray().
      *
      * @param array $differArray the differ array
-     *
-     * @return string
      */
     abstract protected function renderArrayWoker(array $differArray): string;
-    
-    /**
-     * Woker's base function.
-     *
-     * @param array $changes the changes array
-     *
-     * @return string
-     */
-    abstract protected function baseWoker(array $changes): string;
 
     /**
      * Update the Language object.

src/Renderer/Html/AbstractHtml.php

@@ -127,6 +127,29 @@ public function getChanges(Differ $differ): array
         return $changes;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    protected function renderWoker(Differ $differ): string
+    {
+        return $this->redererChanges($this->getChanges($differ));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function renderArrayWoker(array $differArray): string
+    {
+        return $this->redererChanges($this->ensureChangesUseIntTag($differArray));
+    }
+
+    /**
+     * Render the array of changes.
+     *
+     * @param array $changes the changes
+     */
+    abstract protected function redererChanges(array $changes): string;
+
     /**
      * Renderer the changed extent.
      *
@@ -284,4 +307,40 @@ function (array $matches): string {
             $string
         );
     }
+
+    /**
+     * Make sure the "changes" array uses int "tag".
+     *
+     * Internally, we would like always int form for better performance.
+     *
+     * @param array $changes the changes
+     */
+    protected function ensureChangesUseIntTag(array $changes): array
+    {
+        if (empty($changes)) {
+            return [];
+        }
+
+        $isTagInt = true;
+        foreach ($changes as $blocks) {
+            foreach ($blocks as $change) {
+                $isTagInt = \is_int($change['tag']);
+
+                break 2;
+            }
+        }
+
+        if (!$isTagInt) {
+            // convert string tags into their int forms
+            foreach ($changes as &$blocks) {
+                foreach ($blocks as &$change) {
+                    $change['tag'] = SequenceMatcher::opStrToInt($change['tag']);
+                }
+            }
+
+            unset($blocks, $change);
+        }
+
+        return $changes;
+    }
 }

src/Renderer/Html/Inline.php

@@ -4,7 +4,6 @@
 
 namespace Jfcherng\Diff\Renderer\Html;
 
-use Jfcherng\Diff\Differ;
 use Jfcherng\Diff\SequenceMatcher;
 
 /**
@@ -23,32 +22,12 @@ final class Inline extends AbstractHtml
     /**
      * {@inheritdoc}
      */
-    protected function renderWoker(Differ $differ): string
-    {
-        $changes = $this->getChanges($differ);
-        
-        return $this->baseWoker($changes);
-    }
-    
-    /**
-     * {@inheritdoc}
-     */
-    protected function renderArrayWoker(array $differArray): string
-    {
-        $changes = $differArray;
-
-        return $this->baseWoker($changes);
-    }
-    
-    /**
-     * {@inheritdoc}
-     */
-    protected function baseWoker(array $changes): string
+    protected function redererChanges(array $changes): string
     {
         if (empty($changes)) {
             return $this->getResultForIdenticals();
         }
-        
+
         $wrapperClasses = \array_merge(
             $this->options['wrapperClasses'],
             ['diff', 'diff-html', 'diff-inline']

src/Renderer/Html/Json.php

@@ -4,7 +4,6 @@
 
 namespace Jfcherng\Diff\Renderer\Html;
 
-use Jfcherng\Diff\Differ;
 use Jfcherng\Diff\SequenceMatcher;
 
 /**
@@ -36,10 +35,8 @@ public function getResultForIdenticalsDefault(): string
     /**
      * {@inheritdoc}
      */
-    protected function renderWoker(Differ $differ): string
+    protected function redererChanges(array $changes): string
     {
-        $changes = $this->getChanges($differ);
-
         if ($this->options['outputTagAsString']) {
             $this->convertTagToString($changes);
         }
@@ -50,22 +47,6 @@ protected function renderWoker(Differ $differ): string
         );
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function renderArrayWoker(array $differArray): string
-    {
-        return '';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function baseWoker(array $changes): string
-    {
-        return '';
-    }
-
     /**
      * Convert tags of changes to their string form for better readability.
      *

src/Renderer/Html/SideBySide.php

@@ -4,7 +4,6 @@
 
 namespace Jfcherng\Diff\Renderer\Html;
 
-use Jfcherng\Diff\Differ;
 use Jfcherng\Diff\SequenceMatcher;
 
 /**
@@ -23,27 +22,7 @@ final class SideBySide extends AbstractHtml
     /**
      * {@inheritdoc}
      */
-    protected function renderWoker(Differ $differ): string
-    {
-        $changes = $this->getChanges($differ);
-        
-        return $this->baseWoker($changes);
-    }
-    
-    /**
-     * {@inheritdoc}
-     */
-    protected function renderArrayWoker(array $differArray): string
-    {
-        $changes = $differArray;
-        
-        return $this->baseWoker($changes);
-    }
-    
-    /**
-     * {@inheritdoc}
-     */
-    protected function baseWoker(array $changes): string
+    protected function redererChanges(array $changes): string
     {
         if (empty($changes)) {
             return $this->getResultForIdenticals();

src/Renderer/Text/AbstractText.php

@@ -32,16 +32,6 @@ public function renderArrayWoker(array $differArray): string
     {
         throw new UnsupportedFunctionException(__METHOD__);
 
-        return '';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function baseWoker(array $changes): string
-    {
-        throw new UnsupportedFunctionException(__METHOD__);
-
-        return '';
+        return ''; // make IDE not complain
     }
 }