Merge pull request chrisboulton#1 from PhilETaylor/PhilETaylor-PHP7Compatibility

PHP7 Compatibility - remove preg_match with /e modifier

Author: PhilETaylor

lib/Diff/Renderer/Html/Array.php

@@ -177,7 +177,11 @@ 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('# ( +)|^ #is', 
+				function ($m) {
+                			return $this->fixSpaces($m[1]);
+            			}, 
+            			$line);
 		}
 		return $lines;
 	}