PHP 5.5 compatibility fix

samdark · samdark · commit 29dc0029cc81 · 2013-10-15T12:52:58.000+04:00
diff --git a/lib/Diff/Renderer/Html/Array.php b/lib/Diff/Renderer/Html/Array.php
@@ -177,7 +177,7 @@ private 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('# ( +)|^ #', __CLASS__."::fixSpaces", $line);
 		}
 		return $lines;
 	}
@@ -188,7 +188,7 @@ private function formatLines($lines)
 	 * @param string $spaces The string of spaces.
 	 * @return string The HTML representation of the string.
 	 */
-	function fixSpaces($spaces='')
+	public static function fixSpaces($spaces='')
 	{
 		$count = strlen($spaces);
 		if($count == 0) {

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ private function formatLines($lines)`
`177`	`177`	`$lines = array_map(array($this, 'ExpandTabs'), $lines);`
`178`	`178`	`$lines = array_map(array($this, 'HtmlSafe'), $lines);`
`179`	`179`	`foreach($lines as &$line) {`
`180`		`- $line = preg_replace('# ( +)\|^ #e', "\$this->fixSpaces('\\1')", $line);`
	`180`	`+ $line = preg_replace_callback('# ( +)\|^ #', __CLASS__."::fixSpaces", $line);`
`181`	`181`	`}`
`182`	`182`	`return $lines;`
`183`	`183`	`}`
`@@ -188,7 +188,7 @@ private function formatLines($lines)`
`188`	`188`	`* @param string $spaces The string of spaces.`
`189`	`189`	`* @return string The HTML representation of the string.`
`190`	`190`	`*/`
`191`		`- function fixSpaces($spaces='')`
	`191`	`+ public static function fixSpaces($spaces='')`
`192`	`192`	`{`
`193`	`193`	`$count = strlen($spaces);`
`194`	`194`	`if($count == 0) {`