Merge pull request #10 from JBlond/development

Development

README.md

@@ -24,9 +24,9 @@ Example Use
 A quick usage example can be found in the example/ directory and under
 example.php.
 
-![Example Image](https://github.com/jblond/php-diff/raw/master/readme.png "Example")
+![Example Image](readme.png "Example")
 
-![Example 2 Image](https://github.com/jblond/php-diff/raw/master/readme2.png "Example2")
+![Example 2 Image](readme2.png "Example2")
 
 Requirements
 -----------
@@ -54,34 +54,5 @@ Contributors since I forked the repo.
 
 License (BSD License)
 ---------------------
-Copyright (c) 2009 Chris Boulton <[email protected]>
 
-Copyright (c) 2015 Mario Brandt <[email protected]>
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
- - Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
- - Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
- - Neither the name of the Chris Boulton nor the names of its contributors
-   may be used to endorse or promote products derived from this software
-   without specific prior written permission.
-
-```
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-```
+see [License](LICENSE)

lib/jblond/Diff.php

@@ -10,7 +10,7 @@
  * A comprehensive library for generating differences between two strings
  * in multiple formats (unified, side by side HTML etc)
  *
- * PHP version 5
+ * PHP version 7.1 or greater
  *
  * Copyright (c) 2009 Chris Boulton <[email protected]>
  *
@@ -44,7 +44,7 @@
  * @author Chris Boulton <[email protected]>
  * @copyright (c) 2009 Chris Boulton
  * @license New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version 1.6
+ * @version 1.8
  * @link https://github.com/JBlond/php-diff
  */
 class Diff

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

@@ -7,7 +7,7 @@
 /**
  * Base renderer for rendering HTML based diffs for PHP DiffLib.
  *
- * PHP version 5
+ * PHP version 7.1 or greater
  *
  * Copyright (c) 2009 Chris Boulton <[email protected]>
  *
@@ -41,7 +41,7 @@
  * @author Chris Boulton <[email protected]>
  * @copyright (c) 2009 Chris Boulton
  * @license New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version 1.6
+ * @version 1.8
  * @link https://github.com/JBlond/php-diff
  */
 

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

@@ -5,7 +5,7 @@
 /**
  * Inline HTML diff generator for PHP DiffLib.
  *
- * PHP version 5
+ * PHP version 7.1 or greater
  *
  * Copyright (c) 2009 Chris Boulton <[email protected]>
  *
@@ -39,7 +39,7 @@
  * @author Chris Boulton <[email protected]>
  * @copyright (c) 2009 Chris Boulton
  * @license New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version 1.6
+ * @version 1.8
  * @link https://github.com/JBlond/php-diff
  */
 

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

@@ -5,7 +5,7 @@
 /**
  * Side by Side HTML diff generator for PHP DiffLib.
  *
- * PHP version 5
+ * PHP version 7.1 or greater
  *
  * Copyright (c) 2009 Chris Boulton <[email protected]>
  *
@@ -39,7 +39,7 @@
  * @author Chris Boulton <[email protected]>
  * @copyright (c) 2009 Chris Boulton
  * @license New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version 1.6
+ * @version 1.8
  * @link https://github.com/JBlond/php-diff
  */
 

lib/jblond/Diff/Renderer/RendererAbstract.php

@@ -5,7 +5,7 @@
 /**
  * Abstract class for diff renderers in PHP DiffLib.
  *
- * PHP version 5
+ * PHP version 7.1 or greater
  *
  * Copyright (c) 2009 Chris Boulton <[email protected]>
  *
@@ -39,7 +39,7 @@
  * @author Chris Boulton <[email protected]>
  * @copyright (c) 2009 Chris Boulton
  * @license New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version 1.6
+ * @version 1.8
  * @link https://github.com/JBlond/php-diff
  */
 abstract class RendererAbstract

lib/jblond/Diff/Renderer/Text/Context.php

@@ -7,7 +7,7 @@
 /**
  * Context diff generator for PHP DiffLib.
  *
- * PHP version 5
+ * PHP version 7.1 or greater
  *
  * Copyright (c) 2009 Chris Boulton <[email protected]>
  *
@@ -41,7 +41,7 @@
  * @author Chris Boulton <[email protected]>
  * @copyright (c) 2009 Chris Boulton
  * @license New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version 1.6
+ * @version 1.8
  * @link https://github.com/JBlond/php-diff
  */
 

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

@@ -7,7 +7,7 @@
 /**
  * Unified diff generator for PHP DiffLib.
  *
- * PHP version 5
+ * PHP version 7.1 or greater
  *
  * Copyright (c) 2009 Chris Boulton <[email protected]>
  *
@@ -41,7 +41,7 @@
  * @author Chris Boulton <[email protected]>
  * @copyright (c) 2009 Chris Boulton
  * @license New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version 1.6
+ * @version 1.8
  * @link https://github.com/JBlond/php-diff
  */
 

lib/jblond/Diff/SequenceMatcher.php

@@ -5,7 +5,7 @@
 /**
  * Sequence matcher for Diff
  *
- * PHP version 5
+ * PHP version 7.1 or greater
  *
  * Copyright (c) 2009 Chris Boulton <[email protected]>
  *
@@ -39,7 +39,7 @@
  * @author Chris Boulton <[email protected]>
  * @copyright (c) 2009 Chris Boulton
  * @license New BSD License http://www.opensource.org/licenses/bsd-license.php
- * @version 1.6
+ * @version 1.8
  * @link https://github.com/JBlond/php-diff
  */
 class SequenceMatcher

tests/Diff/Renderer/ArrayTest.php

@@ -5,6 +5,8 @@
 use jblond\Diff\Renderer\Html\HtmlArray;
 use PHPUnit\Framework\TestCase;
 
+require "../../../lib/Autoloader.php";
+
 /**
  * Class ArrayTest
  * @package Tests\Diff\Renderer\Html
@@ -20,7 +22,6 @@ class ArrayTest extends TestCase
      */
     public function __construct($name = null, array $data = [], $dataName = '')
     {
-        require "../../../lib/Autoloader.php";
         new \jblond\Autoloader();
         parent::__construct($name, $data, $dataName);
     }