Tidy codes

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

Author: jfcherng

src/Renderer/Html/AbstractHtml.php

@@ -70,12 +70,11 @@ public function getChanges(Differ $differ): array
             $lastBlock = 0;
 
             foreach ($opcodes as [$op, $i1, $i2, $j1, $j2]) {
-                if (
-                    $op === SequenceMatcher::OP_REP &&
-                    $i2 - $i1 === $j2 - $j1
-                ) {
-                    for ($i = 0; $i < $i2 - $i1; ++$i) {
-                        $this->renderChangedExtent($lineRenderer, $old[$i1 + $i], $new[$j1 + $i]);
+                // if there are same amount of lines replaced
+                // we can render the inner detailed changes with corresponding lines
+                if ($op === SequenceMatcher::OP_REP && $i2 - $i1 === $j2 - $j1) {
+                    for ($k = 0; $k < $i2 - $i1; ++$k) {
+                        $this->renderChangedExtent($lineRenderer, $old[$i1 + $k], $new[$j1 + $k]);
                     }
                 }
 
@@ -142,13 +141,17 @@ protected function renderWorker(Differ $differ): string
      */
     protected function renderArrayWorker(array $differArray): string
     {
-        return $this->redererChanges($this->ensureChangesUseIntTag($differArray));
+        $this->ensureChangesUseIntTag($differArray);
+
+        return $this->redererChanges($differArray);
     }
 
     /**
      * Render the array of changes.
      *
      * @param array $changes the changes
+     *
+     * @todo rename typo to renderChanges() in v7
      */
     abstract protected function redererChanges(array $changes): string;
 
@@ -159,8 +162,6 @@ abstract protected function redererChanges(array $changes): string;
      * @param string               $old          the old line
      * @param string               $new          the new line
      *
-     * @throws \InvalidArgumentException
-     *
      * @return static
      */
     protected function renderChangedExtent(AbstractLineRenderer $lineRenderer, string &$old, string &$new): self
@@ -321,32 +322,17 @@ function (array $matches): string {
      *
      * @param array $changes the changes
      */
-    protected function ensureChangesUseIntTag(array $changes): array
+    protected function ensureChangesUseIntTag(array &$changes): void
     {
-        if (empty($changes)) {
-            return [];
-        }
-
-        $isTagInt = true;
-        foreach ($changes as $blocks) {
-            foreach ($blocks as $change) {
-                $isTagInt = \is_int($change['tag']);
-
-                break 2;
-            }
+        // check if the tag is already int type
+        if (\is_int($changes[0][0]['tag'] ?? null)) {
+            return;
         }
 
-        if (!$isTagInt) {
-            // convert string tags into their int forms
-            foreach ($changes as &$blocks) {
-                foreach ($blocks as &$change) {
-                    $change['tag'] = SequenceMatcher::opStrToInt($change['tag']);
-                }
+        foreach ($changes as &$hunks) {
+            foreach ($hunks as &$block) {
+                $block['tag'] = SequenceMatcher::opStrToInt($block['tag']);
             }
-
-            unset($blocks, $change);
         }
-
-        return $changes;
     }
 }

src/Renderer/Html/Json.php

@@ -54,9 +54,9 @@ protected function redererChanges(array $changes): string
      */
     protected function convertTagToString(array &$changes): void
     {
-        foreach ($changes as &$blocks) {
-            foreach ($blocks as &$change) {
-                $change['tag'] = SequenceMatcher::opIntToStr($change['tag']);
+        foreach ($changes as &$hunks) {
+            foreach ($hunks as &$block) {
+                $block['tag'] = SequenceMatcher::opIntToStr($block['tag']);
             }
         }
     }