Fix PHP8 classname incompatibility (Match)

Match is a keyword in PHP8 that is used to do RegExp operations. This causes htmldiff to not function on PHP8 since one its classnames (Match) collides with the new keyword.

I renamed it to MatchingBlock, this is less ambigous, and fixes the PHP incompatibility in the process.

Author: Sven Hagemann

lib/Caxy/HtmlDiff/HtmlDiff.php

@@ -696,7 +696,7 @@ protected function operations()
         $operations = array();
 
         $matches   = $this->matchingBlocks();
-        $matches[] = new Match(count($this->oldWords), count($this->newWords), 0);
+        $matches[] = new MatchingBlock(count($this->oldWords), count($this->newWords), 0);
 
         foreach ($matches as $match) {
             $matchStartsAtCurrentPositionInOld = ($positionInOld === $match->startInOld);
@@ -728,7 +728,7 @@ protected function operations()
     }
 
     /**
-     * @return Match[]
+     * @return MatchingBlock[]
      */
     protected function matchingBlocks()
     {
@@ -784,7 +784,7 @@ protected function stripTagAttributes($word)
      * @param int $startInNew
      * @param int $endInNew
      *
-     * @return Match|null
+     * @return MatchingBlock|null
      */
     protected function findMatch($startInOld, $endInOld, $startInNew, $endInNew)
     {
@@ -837,7 +837,7 @@ protected function findMatch($startInOld, $endInOld, $startInNew, $endInNew)
                 !$this->isOnlyWhitespace($this->array_slice_cached($this->oldWords, $bestMatchInOld, $bestMatchSize))
             )
         ) {
-            return new Match($bestMatchInOld, $bestMatchInNew, $bestMatchSize);
+            return new MatchingBlock($bestMatchInOld, $bestMatchInNew, $bestMatchSize);
         }
 
         return null;

lib/Caxy/HtmlDiff/Match.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Caxy\HtmlDiff;
+
+/**
+ * A (string) block of text is the same between the two provided versions.
+ */
+class MatchingBlock implements \Countable
+{
+    public $startInOld;
+    public $startInNew;
+    public $size;
+
+    public function __construct(int $startInOld, int $startInNew, int $size)
+    {
+        $this->startInOld = $startInOld;
+        $this->startInNew = $startInNew;
+        $this->size       = $size;
+    }
+
+    public function endInOld() : int
+    {
+        return ($this->startInOld + $this->size);
+    }
+
+    public function endInNew() : int
+    {
+        return ($this->startInNew + $this->size);
+    }
+
+    public function count() : int
+    {
+        return (int)$this->size;
+    }
+}