Merge pull request #18 from ErnestStaug/php-8-update

Add support of PHP 8.0

Author: yetanotherape

.gitignore

@@ -24,3 +24,4 @@ Thumbs.db
 # Stub for empty folders #
 ##########################
 !.gitkeep
+.phpunit.result.cache

.travis.yml

@@ -1,23 +1,9 @@
 language: php
 
 php:
-- 5.6
-- 7.0
-- 7.1
-- 7.2
 - 7.3
 - 7.4
+- 8.0
 
 install:
 - composer install
-
-matrix:
-  include:
-  - php: 5.3
-    dist: precise
-  - php: 5.4
-    dist: trusty
-  - php: 5.5
-    dist: trusty
-  allow_failures:
-  - php: 5.3

Dockerfile

@@ -16,4 +16,4 @@ CMD [ "/bin/bash" ]
 # export PHP_VERSION=7.2
 # docker build -t dmp:${PHP_VERSION} --build-arg PHP_VERSION=${PHP_VERSION} .
 # docker run -it --rm dmp:${PHP_VERSION} ./vendor/bin/phpunit
-# docker run -it --rm -v `pwd`:/usr/src/myapp dmp:${PHP_VERSION}
+# docker run -it --rm -v `pwd`/src:/app/src -v `pwd`/tests:/app/tests dmp:${PHP_VERSION}

README.md

@@ -144,7 +144,7 @@ of a flexible [matching and patching strategy](http://neil.fraser.name/writing/p
 
 ## Requirements
 
-* PHP 5.3+
+* PHP 7.3+
 * [Composer](http://getcomposer.org/)
 
 ## License

composer.json

@@ -17,13 +17,13 @@
         }
     ],
     "require": {
-        "php": ">=5.3, <8.0",
+        "php": ">=7.3",
         "ext-iconv": "*",
         "ext-json": "*",
         "ext-mbstring": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "4.*"
+        "phpunit/phpunit": "9.*"
     },
     "autoload": {
         "psr-4": {

src/DiffMatchPatch.php

@@ -66,9 +66,9 @@ class DiffMatchPatch
      */
     protected $diff;
     /**
-     * @var Match
+     * @var Matcher
      */
-    protected $match;
+    protected $matcher;
     /**
      * @var Patch
      */
@@ -92,13 +92,13 @@ public function __get($name)
                 $result = $this->diff->getEditCost();
                 break;
             case 'Match_Threshold':
-                $result = $this->match->getThreshold();
+                $result = $this->matcher->getThreshold();
                 break;
             case 'Match_Distance':
-                $result = $this->match->getDistance();
+                $result = $this->matcher->getDistance();
                 break;
             case 'Match_MaxBits':
-                $result = $this->match->getMaxBits();
+                $result = $this->matcher->getMaxBits();
                 break;
             case 'Patch_DeleteThreshold':
                 $result = $this->patch->getDeleteTreshold();
@@ -132,13 +132,13 @@ public function __set($name, $value)
                 $this->diff->setEditCost($value);
                 break;
             case 'Match_Threshold':
-                $this->match->setThreshold($value);
+                $this->matcher->setThreshold($value);
                 break;
             case 'Match_Distance':
-                $this->match->setDistance($value);
+                $this->matcher->setDistance($value);
                 break;
             case 'Match_MaxBits':
-                $this->match->setMaxBits($value);
+                $this->matcher->setMaxBits($value);
                 break;
             case 'Patch_DeleteThreshold':
                 $this->patch->setDeleteTreshold($value);
@@ -154,8 +154,8 @@ public function __set($name, $value)
     public function __construct()
     {
         $this->diff = new Diff();
-        $this->match = new Match();
-        $this->patch = new Patch($this->diff, $this->match);
+        $this->matcher = new Matcher();
+        $this->patch = new Patch($this->diff, $this->matcher);
     }
 
     /**
@@ -240,7 +240,7 @@ public function diff_prettyHtml($diffs)
      */
     public function match_main($text, $pattern, $loc = 0)
     {
-        return $this->match->main($text, $pattern, $loc);
+        return $this->matcher->main($text, $pattern, $loc);
     }
 
     /**

src/Match.php src/Matcher.phpsrc/Match.php renamed to src/Matcher.php

@@ -28,7 +28,7 @@
  * @author Neil Fraser <fraser@google.com>
  * @author Daniil Skrobov <yetanotherape@gmail.com>
  */
-class Match {
+class Matcher {
 
     /**
      * @var float At what point is no match declared (0.0 = perfection, 1.0 = very loose).

src/Patch.php

@@ -46,25 +46,25 @@ class Patch
      */
     protected $diff;
     /**
-     * @var Match
+     * @var Matcher
      */
-    protected $match;
+    protected $matcher;
 
     /**
      * @param Diff|null $diff
-     * @param Match|null $match
+     * @param Matcher|null $matcher
      */
-    public function __construct(Diff $diff = null, Match $match = null)
+    public function __construct(Diff $diff = null, Matcher $matcher = null)
     {
-        if (!isset($match)) {
-            $match = new Match();
+        if (!isset($matcher)) {
+            $matcher = new Matcher();
         }
         if (!isset($diff)) {
             $diff = new Diff();
         }
 
         $this->diff = $diff;
-        $this->match = $match;
+        $this->matcher = $matcher;
     }
 
     /**
@@ -100,11 +100,11 @@ public function setMargin($margin)
     }
 
     /**
-     * @return Match
+     * @return Matcher
      */
-    protected function getMatch()
+    protected function getMatcher()
     {
-        return $this->match;
+        return $this->matcher;
     }
 
     /**
@@ -233,10 +233,10 @@ public function addContext(PatchObject $patch, $text)
 
         // Look for the first and last matches of pattern in text.
         // If two different matches are found, increase the pattern length.
-        $match = $this->getMatch();
+        $matcher = $this->getMatcher();
         while (
             (!$pattern || mb_strpos($text, $pattern) !== mb_strrpos($text, $pattern)) &&
-            ($match->getMaxBits() == 0 || mb_strlen($pattern) < $match->getMaxBits() - 2 * $this->getMargin())
+            ($matcher->getMaxBits() == 0 || mb_strlen($pattern) < $matcher->getMaxBits() - 2 * $this->getMargin())
         ) {
             $padding += $this->getMargin();
             $pattern = mb_substr(
@@ -409,7 +409,7 @@ public function make($a, $b = null, $c = null)
      */
     public function splitMax(&$patches)
     {
-        $patchSize = $this->getMatch()->getMaxBits();
+        $patchSize = $this->getMatcher()->getMaxBits();
         if ($patchSize == 0) {
             // TODO PHP has fixed size int, so this case isn't relevant.
             return;
@@ -619,8 +619,8 @@ public function apply($patches, $text)
         $delta = 0;
         $results = array();
         $diff = $this->getDiff();
-        $match = $this->getMatch();
-        $maxBits = $match->getMaxBits();
+        $matcher = $this->getMatcher();
+        $maxBits = $matcher->getMaxBits();
 
         foreach ($patches as $patch) {
             $expectedLoc = $patch->getStart2() + $delta;
@@ -632,18 +632,18 @@ public function apply($patches, $text)
             if ($text1Len > $maxBits) {
                 // self::splitMax() will only provide an oversized pattern in the case of
                 // a monster delete.
-                $startLoc = $match->main($text, mb_substr($text1, 0, $maxBits), $expectedLoc);
+                $startLoc = $matcher->main($text, mb_substr($text1, 0, $maxBits), $expectedLoc);
 
                 if ($startLoc != -1) {
-                    $endLoc = $match->main($text, mb_substr($text1, -$maxBits),
+                    $endLoc = $matcher->main($text, mb_substr($text1, -$maxBits),
                         $expectedLoc + $text1Len - $maxBits);
                     if ($endLoc == -1 || $startLoc >= $endLoc) {
                         // Can't find valid trailing context.  Drop this patch.
                         $startLoc = -1;
                     }
                 }
             } else {
-                $startLoc = $match->main($text, $text1, $expectedLoc);
+                $startLoc = $matcher->main($text, $text1, $expectedLoc);
             }
 
             if ($startLoc == -1) {

tests/DiffMatchPatchTest.php

@@ -21,6 +21,8 @@
 
 namespace DiffMatchPatch;
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * DiffMatchPatchTest tests that all methods successfully proxies.
  * DiffTest, MatchTest and PatchTest contains all other unit tests.
@@ -29,14 +31,14 @@
  * @author Neil Fraser <fraser@google.com>
  * @author Daniil Skrobov <yetanotherape@gmail.com>
  */
-class DiffMatchPatchTest extends \PHPUnit_Framework_TestCase
+class DiffMatchPatchTest extends TestCase
 {
     /**
      * @var DiffMatchPatch
      */
     protected $dmp;
 
-    protected  function setUp() {
+    protected  function setUp():void {
         mb_internal_encoding('UTF-8');
 
         $this->dmp = new DiffMatchPatch();

tests/DiffTest.php

@@ -21,19 +21,21 @@
 
 namespace DiffMatchPatch;
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * @package DiffMatchPatch
  * @author Neil Fraser <fraser@google.com>
  * @author Daniil Skrobov <yetanotherape@gmail.com>
  */
-class DiffTest extends \PHPUnit_Framework_TestCase
+class DiffTest extends TestCase
 {
     /**
      * @var Diff
      */
     protected $d;
 
-    protected  function setUp() {
+    protected  function setUp(): void {
         mb_internal_encoding('UTF-8');
 
         $this->d = new Diff();