Code tidy

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

Author: jfcherng

src/Diff.php

@@ -92,11 +92,9 @@ public function setOldNew(array $old, array $new): self
      */
     public function setOld(array $old): self
     {
-        if ($this->old !== $old) {
-            $this->old = $old;
-            $this->groupedCodes = null;
-            $this->sequenceMatcher->setSeq1($old);
-        }
+        $this->old = $old;
+        $this->sequenceMatcher->setSeq1($old);
+        $this->resetCachedResults();
 
         return $this;
     }
@@ -110,11 +108,9 @@ public function setOld(array $old): self
      */
     public function setNew(array $new): self
     {
-        if ($this->new !== $new) {
-            $this->new = $new;
-            $this->groupedCodes = null;
-            $this->sequenceMatcher->setSeq2($new);
-        }
+        $this->new = $new;
+        $this->sequenceMatcher->setSeq2($new);
+        $this->resetCachedResults();
 
         return $this;
     }
@@ -131,6 +127,7 @@ public function setOptions(array $options): self
         $this->options = $options + static::$defaultOptions;
 
         $this->sequenceMatcher->setOptions($this->options);
+        $this->resetCachedResults();
 
         return $this;
     }
@@ -201,6 +198,18 @@ public function getGroupedOpcodes(): array
             $this->sequenceMatcher->getGroupedOpcodes($this->options['context']);
     }
 
+    /**
+     * Reset cached results.
+     *
+     * @return self
+     */
+    public function resetCachedResults(): self
+    {
+        $this->groupedCodes = null;
+
+        return $this;
+    }
+
     /**
      * Render a diff using the supplied rendering class and return it.
      *

src/Renderer/Html/AbstractHtml.php

@@ -77,7 +77,12 @@ public function getChanges(): array
                 $lastTag = $tag;
 
                 if ($tag === SequenceMatcher::OP_EQ) {
-                    if (!empty($lines = \array_slice($old, $i1, ($i2 - $i1)))) {
+                    /**
+                     * @todo Technically this is wrong.
+                     *       The old and the new may not be exactly the same
+                     *       because of ignoreCase and ignoreWhitespace.
+                     */
+                    if (!empty($lines = \array_slice($old, $i1, $i2 - $i1))) {
                         $formattedLines = $this->formatLines($lines);
 
                         $blocks[$lastBlock]['base']['lines'] += $formattedLines;
@@ -101,7 +106,7 @@ public function getChanges(): array
                     $tag === SequenceMatcher::OP_REP ||
                     $tag === SequenceMatcher::OP_DEL
                 ) {
-                    $lines = \array_slice($old, $i1, ($i2 - $i1));
+                    $lines = \array_slice($old, $i1, $i2 - $i1);
                     $lines = $this->formatLines($lines);
                     $lines = \str_replace(
                         RendererConstant::HTML_CLOSURES,
@@ -116,7 +121,7 @@ public function getChanges(): array
                     $tag === SequenceMatcher::OP_REP ||
                     $tag === SequenceMatcher::OP_INS
                 ) {
-                    $lines = \array_slice($new, $j1, ($j2 - $j1));
+                    $lines = \array_slice($new, $j1, $j2 - $j1);
                     $lines = $this->formatLines($lines);
                     $lines = \str_replace(
                         RendererConstant::HTML_CLOSURES,

src/Renderer/Html/LineRenderer/AbstractLineRenderer.php

@@ -29,7 +29,7 @@ abstract class AbstractLineRenderer implements LineRendererInterface
     /**
      * The constructor.
      *
-     * @param array $diffOptions     the difference options
+     * @param array $diffOptions     the diff options
      * @param array $templateOptions the template options
      */
     public function __construct(array $diffOptions, array $templateOptions)
@@ -44,7 +44,7 @@ public function __construct(array $diffOptions, array $templateOptions)
     /**
      * Set the diff options.
      *
-     * @param array $diffOptions the options
+     * @param array $diffOptions the diff options
      *
      * @return self
      */