Update jfcherng/php-sequence-matcher ^3.0

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

Author: jfcherng

composer.json

@@ -26,7 +26,7 @@
     "require": {
         "php": "^7.1.3",
         "jfcherng/php-mb-string": "^1.3",
-        "jfcherng/php-sequence-matcher": "^2.0",
+        "jfcherng/php-sequence-matcher": "^3.0",
         "squizlabs/php_codesniffer": "^3.4"
     },
     "require-dev": {

composer.lock

@@ -56,7 +56,7 @@ public function getChanges(): array
 
         foreach ($this->diff->getGroupedOpcodes() as $opcodes) {
             $blocks = [];
-            $lastTag = null;
+            $lastTag = 0;
             $lastBlock = 0;
 
             foreach ($opcodes as [$tag, $i1, $i2, $j1, $j2]) {
@@ -88,20 +88,7 @@ public function getChanges(): array
                     continue;
                 }
 
-                /**
-                 * @todo By setting option "useIntOpcodes" for the sequence matcher,
-                 *       this "if" could be further optimized by using bit operations.
-                 *
-                 *       Like this: "if ($tag & (OP_INT_REP | OP_INT_DEL))"
-                 *
-                 *       But int tag would be less readable while debugging.
-                 *       Also, this would be a BC break for the output of the JSON renderer.
-                 *       Is it worth doing?
-                 */
-                if (
-                    $tag === SequenceMatcher::OP_REP ||
-                    $tag === SequenceMatcher::OP_DEL
-                ) {
+                if ($tag & (SequenceMatcher::OP_REP | SequenceMatcher::OP_DEL)) {
                     $lines = \array_slice($old, $i1, $i2 - $i1);
                     $lines = $this->formatLines($lines);
                     $lines = \str_replace(
@@ -113,10 +100,7 @@ public function getChanges(): array
                     $blocks[$lastBlock]['old']['lines'] += $lines;
                 }
 
-                if (
-                    $tag === SequenceMatcher::OP_REP ||
-                    $tag === SequenceMatcher::OP_INS
-                ) {
+                if ($tag & (SequenceMatcher::OP_REP | SequenceMatcher::OP_INS)) {
                     $lines = \array_slice($new, $j1, $j2 - $j1);
                     $lines = $this->formatLines($lines);
                     $lines = \str_replace(
@@ -167,13 +151,13 @@ protected function renderChangedExtent(AbstractLineRenderer $lineRenderer, strin
     /**
      * Get the default block.
      *
-     * @param string $tag the operation tag
-     * @param int    $i1  begin index of the diff of the old array
-     * @param int    $j1  begin index of the diff of the new array
+     * @param int $tag the operation tag
+     * @param int $i1  begin index of the diff of the old array
+     * @param int $j1  begin index of the diff of the new array
      *
      * @return array the default block
      */
-    protected function getDefaultBlock(string $tag, int $i1, int $j1): array
+    protected function getDefaultBlock(int $tag, int $i1, int $j1): array
     {
         return [
             'tag' => $tag,

src/Renderer/Html/AbstractHtml.php

@@ -48,17 +48,11 @@ public function render(): string
                     continue;
                 }
 
-                if (
-                    $tag === SequenceMatcher::OP_REP ||
-                    $tag === SequenceMatcher::OP_DEL
-                ) {
+                if ($tag & (SequenceMatcher::OP_REP | SequenceMatcher::OP_DEL)) {
                     $ret .= $this->renderContext('-', $this->diff->getOld($i1, $i2));
                 }
 
-                if (
-                    $tag === SequenceMatcher::OP_REP ||
-                    $tag === SequenceMatcher::OP_INS
-                ) {
+                if ($tag & (SequenceMatcher::OP_REP | SequenceMatcher::OP_INS)) {
                     $ret .= $this->renderContext('+', $this->diff->getNew($j1, $j2));
                 }
             }