Replace the substring with multi byte

Author: JBlond

lib/Diff/Renderer/Html/Array.php

@@ -51,6 +51,50 @@ class Diff_Renderer_Html_Array extends Diff_Renderer_Abstract
 		'tabSize' => 4
 	);
 
+	/**
+	* From https://gist.github.com/stemar/8287074
+	* @param mixed $string The input string.
+	* @param mixed $replacement The replacement string.
+	* @param mixed $start If start is positive, the replacing will begin at the start'th offset into string.  If start is negative, the replacing will begin at the start'th character from the end of string.
+	* @param mixed $length If given and is positive, it represents the length of the portion of string which is to be replaced. If it is negative, it represents the number of characters from the end of string at which to stop replacing. If it is not given, then it will default to strlen( string ); i.e. end the replacing at the end of string. Of course, if length is zero then this function will have the effect of inserting replacement into string at the given start offset.
+	* @return string The result string is returned. If string is an array then array is returned.
+	*/
+	public function mb_substr_replace($string, $replacement, $start, $length=NULL) {
+		if (is_array($string)) {
+			$num = count($string);
+			// $replacement
+			$replacement = is_array($replacement) ? array_slice($replacement, 0, $num) : array_pad(array($replacement), $num, $replacement);
+			// $start
+			if (is_array($start)) {
+				$start = array_slice($start, 0, $num);
+				foreach ($start as $key => $value)
+					$start[$key] = is_int($value) ? $value : 0;
+			}
+			else {
+				$start = array_pad(array($start), $num, $start);
+			}
+			// $length
+			if (!isset($length)) {
+				$length = array_fill(0, $num, 0);
+			}
+			elseif (is_array($length)) {
+				$length = array_slice($length, 0, $num);
+				foreach ($length as $key => $value)
+					$length[$key] = isset($value) ? (is_int($value) ? $value : $num) : 0;
+			}
+			else {
+				$length = array_pad(array($length), $num, $length);
+			}
+			// Recursive call
+			return array_map(__FUNCTION__, $string, $replacement, $start, $length);
+		}
+		preg_match_all('/./us', (string)$string, $smatches);
+		preg_match_all('/./us', (string)$replacement, $rmatches);
+		if ($length === NULL) $length = mb_strlen($string);
+		array_splice($smatches[0], $start, $length, $rmatches[0]);
+		return join($smatches[0]);
+	}
+
 	/**
 	 * Render and return an array structure suitable for generating HTML
 	 * based differences. Generally called by subclasses that generate a
@@ -83,11 +127,11 @@ public function render()
 						list($start, $end) = $this->getChangeExtent($fromLine, $toLine);
 						if($start != 0 || $end != 0) {
 							$last = $end + strlen($fromLine);
-							$fromLine = substr_replace($fromLine, "\0", $start, 0);
-							$fromLine = substr_replace($fromLine, "\1", $last + 1, 0);
+							$fromLine = $this->mb_substr_replace($fromLine, "\0", $start, 0);
+							$fromLine = $this->mb_substr_replace($fromLine, "\1", $last + 1, 0);
 							$last = $end + strlen($toLine);
-							$toLine = substr_replace($toLine, "\0", $start, 0);
-							$toLine = substr_replace($toLine, "\1", $last + 1, 0);
+							$toLine = $this->mb_substr_replace($toLine, "\0", $start, 0);
+							$toLine = $this->mb_substr_replace($toLine, "\1", $last + 1, 0);
 							$a[$i1 + $i] = $fromLine;
 							$b[$j1 + $i] = $toLine;
 						}