Merge pull request #42 from petrkotek/php7-compatibility

PHP7 compatibility: Avoid using 'e' modifier in preg_replace

Author: chrisboulton

composer.json

@@ -1,16 +1,19 @@
 {
     "name": "chrisboulton/php-diff",
-	"type": "library",
+    "type": "library",
     "description": "A comprehensive library for generating differences between two hashable objects (strings or arrays).",
     "authors": [
         {
             "name": "Chris Boulton",
             "email": "@chrisboulton"
         }
     ],
-	"autoload": {
-		"psr-0": {
-		   "Diff": "lib/"
-		}
-	}
-}
+    "autoload": {
+        "psr-0": {
+           "Diff": "lib/"
+        }
+    },
+    "require-dev": {
+        "phpunit/phpunit": "~5.5"
+    }
+}

lib/Diff/Renderer/Html/Array.php

@@ -177,19 +177,20 @@ protected function formatLines($lines)
 		$lines = array_map(array($this, 'ExpandTabs'), $lines);
 		$lines = array_map(array($this, 'HtmlSafe'), $lines);
 		foreach($lines as &$line) {
-			$line = preg_replace('# ( +)|^ #e', "\$this->fixSpaces('\\1')", $line);
+			$line = preg_replace_callback('# ( +)|^ #', array($this, 'fixSpaces'), $line);
 		}
 		return $lines;
 	}
 
 	/**
 	 * Replace a string containing spaces with a HTML representation using  .
 	 *
-	 * @param string $spaces The string of spaces.
+	 * @param string[] $matches Array with preg matches.
 	 * @return string The HTML representation of the string.
 	 */
-	function fixSpaces($spaces='')
+	private function fixSpaces(array $matches)
 	{
+		$spaces = $matches[1];
 		$count = strlen($spaces);
 		if($count == 0) {
 			return '';

phpunit.xml

@@ -0,0 +1,7 @@
+<phpunit bootstrap="vendor/autoload.php">
+    <testsuites>
+        <testsuite name="unit">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>

tests/Diff/Renderer/Html/ArrayTest.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace Tests\Diff\Renderer\Html;
+
+class ArrayTest extends \PHPUnit_Framework_TestCase
+{
+    public function testRenderSimpleDelete()
+    {
+        $htmlRenderer = new \Diff_Renderer_Html_Array();
+        $htmlRenderer->diff = new \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 \Diff_Renderer_Html_Array();
+        $htmlRenderer->diff = new \Diff(
+            array('    a'),
+            array('a')
+        );
+
+        $result = $htmlRenderer->render();
+
+        static::assertEquals(array(
+            array(
+                array(
+                    'tag' => 'replace',
+                    'base' => array(
+                        'offset' => 0,
+                        'lines' => array(
+                            '<del>&nbsp; &nbsp;</del>a',
+                        )
+                    ),
+                    'changed' => array(
+                        'offset' => 0,
+                        'lines' => array(
+                            '<ins></ins>a'
+                        )
+                    )
+                )
+            )
+        ), $result);
+    }
+}

tests/bootstrap.php

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