Code cleanup, bumped required PHP version to >= 7.2 and updated readme.

- Removed unreachable code from Diff::getArgumentType().
- Updated readme files to include the Unified HTML diff-view, PHP >= 7.2
requirement and DigiLive as contributor.
- Updated PHP >= 7.2 requirement in file docBlocks.

Author: DigiLive

README.md

@@ -13,6 +13,7 @@ rendered in all of the standard formats including:
  * Context
  * Inline HTML
  * Side by Side HTML
+ * Unified HTML
 
 The logic behind the core of the diff engine (ie, the sequence matcher)
 is primarily based on the Python difflib package. The reason for doing
@@ -36,21 +37,21 @@ require 'vendor/autoload.php';
 require dirname(__FILE__).'/../lib/Autoloader.php';
 new \jblond\Autoloader(); 
 
-$a = explode("\n", file_get_contents(dirname(__FILE__).'/a.txt'));
-$b = explode("\n", file_get_contents(dirname(__FILE__).'/b.txt'));
+$a = file_get_contents(dirname(__FILE__).'/a.txt');
+$b = file_get_contents(dirname(__FILE__).'/b.txt');
 // Options for generating the diff
-$options = array(
+$options = [
     //'ignoreWhitespace' => true,
     //'ignoreCase' => true,
-);
+];
 // Initialize the diff class
 $diff = new \jblond\Diff($a, $b, $options);
 
 //choose renderer
-$renderer = new \jblond\Diff\Renderer\Html\SideBySide(array(
+$renderer = new \jblond\Diff\Renderer\Html\SideBySide([
     'title_a' => 'Custom title for OLD version',
     'title_b' => 'Custom title for NEW version',
-));
+]);
 
 //show it
 echo $diff->Render($renderer);
@@ -66,7 +67,7 @@ example.php.
 
 ## Requirements
 
-- PHP 7.1 or greater
+- PHP 7.2 or greater
 - PHP Multibyte String 
 
 ## Merge files using jQuery
@@ -86,6 +87,7 @@ Contributors since I forked the repo.
 - maxxer
 - Creris
 - jfcherng
+- DigiLive
 
 ### License (BSD License)
 

composer.json

@@ -1,41 +1,39 @@
 {
-    "name": "jblond/php-diff",
-    "type": "library",
-    "description": "A comprehensive library for generating differences between two hashable objects (strings or arrays).",
-    "license": "BSD-3-Clause",
-    "keywords": [
-        "php",
-        "diff"
-    ],
-    "authors": [
-        {
-            "name": "Mario",
-            "email": "leet31337@web.de"
-        },
-        {
-            "name": "Chris Boulton",
-            "email": "chris.boulton@interspire.com"
-        }
-    ],
-    "require": {
-        "php" : ">= 7.1",
-        "ext-mbstring": "*"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "8.*",
-        "squizlabs/php_codesniffer": "*"
-    },
-    "autoload": {
-        "psr-4": {
-           "jblond\\": "lib/jblond"
-        }
-    },
-    "config": {
-        "classmap-authoritative": true
-    },
-    "scripts": {
-        "phpunit": "phpunit ./tests/",
-        "php_src": "phpcs --standard=phpcs.xml -s -p --colors ./lib/",
-        "php_test": "phpcs --standard=phpcs.xml -s -p --colors ./tests/"
-    }
-}
+	"name" : "jblond/php-diff",
+	"type" : "library",
+	"description" : "A comprehensive library for generating differences between two hashable objects (strings or arrays).",
+	"license" : "BSD-3-Clause",
+	"keywords" : [
+		"php",
+		"diff"
+	],
+	"authors" : [{
+			"name" : "Mario",
+			"email" : "leet31337@web.de"
+		}, {
+			"name" : "Chris Boulton",
+			"email" : "chris.boulton@interspire.com"
+		}
+	],
+	"require" : {
+		"php" : ">= 7.2",
+		"ext-mbstring" : "*"
+	},
+	"require-dev" : {
+		"phpunit/phpunit" : "8.*",
+		"squizlabs/php_codesniffer" : "*"
+	},
+	"autoload" : {
+		"psr-4" : {
+			"jblond\\" : "lib/jblond"
+		}
+	},
+	"config" : {
+		"classmap-authoritative" : true
+	},
+	"scripts" : {
+		"phpunit" : "phpunit ./tests/",
+		"php_src" : "phpcs --standard=phpcs.xml -s -p --colors ./lib/",
+		"php_test" : "phpcs --standard=phpcs.xml -s -p --colors ./tests/"
+	}
+}

composer.lock

@@ -7,7 +7,7 @@
  *
  * Library to automatically include required files when a script calls a class.
  *
- * PHP version 7.1 or greater
+ * PHP version 7.2 or greater
  *
  * @package jblond
  * @author Chris Boulton <chris.boulton@interspire.com>

lib/Autoloader.php

@@ -12,7 +12,7 @@
  * A comprehensive library for comparing two strings and generating the differences between them in multiple formats.
  * (unified, side by side, inline, HTML, etc.)
  *
- * PHP version 7.1 or greater
+ * PHP version 7.2 or greater
  *
  * @package jblond
  * @author Chris Boulton <chris.boulton@interspire.com>
@@ -201,9 +201,6 @@ public function getArgumentType($var): int
             default:
                 throw new \InvalidArgumentException('Invalid argument type! Argument must be of type array or string.');
         }
-
-        $length = $end - $start;
-        return array_slice($this->new, $start, $length);
     }
 
     /**

lib/jblond/Diff.php

@@ -9,7 +9,7 @@
 /**
  * Base renderer for rendering HTML based diffs for PHP DiffLib.
  *
- * PHP version 7.1 or greater
+ * PHP version 7.2 or greater
  *
  * @package jblond\Diff\Renderer\Html
  * @author Chris Boulton <chris.boulton@interspire.com>

lib/jblond/Diff/Renderer/Html/HtmlArray.php

@@ -7,7 +7,7 @@
 /**
  * Inline HTML diff generator for PHP DiffLib.
  *
- * PHP version 7.1 or greater
+ * PHP version 7.2 or greater
  *
  * @package jblond\Diff\Renderer\Html
  * @author Chris Boulton <chris.boulton@interspire.com>

lib/jblond/Diff/Renderer/Html/Inline.php

@@ -7,7 +7,7 @@
 /**
  * Side by Side HTML diff generator for PHP DiffLib.
  *
- * PHP version 7.1 or greater
+ * PHP version 7.2 or greater
  *
  * @package jblond\Diff\Renderer\Html
  * @author Chris Boulton <chris.boulton@interspire.com>

lib/jblond/Diff/Renderer/Html/SideBySide.php

@@ -7,7 +7,7 @@
 /**
  * Unified HTML diff generator for PHP DiffLib.
  *
- * PHP version 7.1 or greater
+ * PHP version 7.2 or greater
  *
  * @package jblond\Diff\Renderer\Html
  * @author Chris Boulton <chris.boulton@interspire.com>

lib/jblond/Diff/Renderer/Html/Unified.php

@@ -9,7 +9,7 @@
 /**
  * Abstract class for diff renderers in PHP DiffLib.
  *
- * PHP version 7.1 or greater
+ * PHP version 7.2 or greater
  *
  * @package jblond\Diff\Renderer
  * @author Chris Boulton <chris.boulton@interspire.com>