Unittests

.gitignore

@@ -0,0 +1 @@
+/vendor

composer.json

@@ -21,9 +21,12 @@
         "php" : ">= 5.4",
         "ext-mbstring": "*"
     },
+    "require-dev": {
+        "phpunit/phpunit": "7.*"
+    },
     "autoload": {
-        "psr-0": {
-           "Diff": "lib/"
+        "psr-4": {
+           "jblond\\Diff\\": "lib/jblond"
         }
     }
 }

lib/jblond/Diff.php

@@ -43,7 +43,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.4
+ * @version 1.5
  * @link https://github.com/JBlond/php-diff
  */
 

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

@@ -40,7 +40,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.4
+ * @version 1.5
  * @link https://github.com/JBlond/php-diff
  */
 
@@ -218,7 +218,7 @@ private function getChangeExtent($fromLine, $toLine)
 	/**
 	 * Format a series of lines suitable for output in a HTML rendered diff.
 	 * This involves replacing tab characters with spaces, making the HTML safe
-	 * for output, ensuring that double spaces are replaced with &nbsp; etc.
+	 * for output, ensuring that double spaces are replaced with &#xA0; etc.
 	 *
 	 * @param array $lines Array of lines to format.
 	 * @return array Array of the formatted lines.
@@ -236,7 +236,7 @@ protected function formatLines($lines)
 	}
 
 	/**
-	 * Replace a string containing spaces with a HTML representation using &nbsp;.
+	 * Replace a string containing spaces with a HTML representation using &#xA0;.
 	 *
 	 * @param array $matches The string of spaces.
 	 * @return string The HTML representation of the string.
@@ -252,7 +252,7 @@ protected function fixSpaces($matches)
 			}
 			$div = floor($count / 2);
 			$mod = $count % 2;
-			$buffer	.= str_repeat('&nbsp; ', $div).str_repeat('&#xA0;', $mod);
+			$buffer	.= str_repeat('&#xA0; ', $div).str_repeat('&#xA0;', $mod);
 		}
 
 		$div = floor($count / 2);

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

@@ -38,7 +38,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.4
+ * @version 1.5
  * @link https://github.com/JBlond/php-diff
  */
 

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

@@ -38,7 +38,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.4
+ * @version 1.5
  * @link https://github.com/JBlond/php-diff
  */
 

lib/jblond/Diff/Renderer/RendererAbstract.php

@@ -38,7 +38,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.4
+ * @version 1.5
  * @link https://github.com/JBlond/php-diff
  */
 

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

@@ -40,7 +40,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.4
+ * @version 1.5
  * @link https://github.com/JBlond/php-diff
  */
 

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

@@ -40,7 +40,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.4
+ * @version 1.5
  * @link https://github.com/JBlond/php-diff
  */
 

lib/jblond/Diff/SequenceMatcher.php

@@ -38,7 +38,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.4
+ * @version 1.5
  * @link https://github.com/JBlond/php-diff
  */
 

tests/Diff/Renderer/ArrayTest.php

@@ -0,0 +1,66 @@
+<?php
+namespace Tests\Diff\Renderer\Html;
+use jblond\Autoloader;
+use jblond\Diff\Renderer\Html\HtmlArray;
+use PHPUnit\Framework\TestCase;
+
+require "../../../lib/Autoloader.php";
+new Autoloader();
+
+class ArrayTest extends TestCase
+{
+	public function testRenderSimpleDelete()
+	{
+		$htmlRenderer = new HtmlArray();
+		$htmlRenderer->diff = new \jblond\Diff(
+			array('a'),
+			array()
+		);
+		$result = $htmlRenderer->render();
+		static::assertEquals(array(
+			array(
+				array(
+					'tag' => 'delete',
+					'base' => array(
+						'offset' => 0,
+						'lines' => array(
+							'a'
+						)
+					),
+					'changed' => array(
+						'offset' => 0,
+						'lines' => array()
+					)
+				)
+			)
+		), $result);
+	}
+	public function testRenderFixesSpaces()
+	{
+		$htmlRenderer = new HtmlArray();
+		$htmlRenderer->diff = new \jblond\Diff(
+			array('    a'),
+			array('a')
+		);
+		$result = $htmlRenderer->render();
+		static::assertEquals(array(
+			array(
+				array(
+					'tag' => 'replace',
+					'base' => array(
+						'offset' => 0,
+						'lines' => array(
+							'<del>&#xA0; &#xA0;</del>a',
+						)
+					),
+					'changed' => array(
+						'offset' => 0,
+						'lines' => array(
+							'<ins></ins>a'
+						)
+					)
+				)
+			)
+		), $result);
+	}
+}

tests/bootstrap.php

@@ -0,0 +1,3 @@
+<?php
+//require_once __DIR__ .
+require_once '../lib/Autoloader.php';