From b91cc556800e58401e2631ae145c627bb5a0e955 Mon Sep 17 00:00:00 2001
From: gfra54 <gilles@sofoot.com>
Date: Sun, 6 Apr 2014 12:52:39 +0200
Subject: [PATCH] Customise "old" and "new" labels

You can pass an array of options to the main renderer that will let you
customize the "old" and "new" labels to fit your needs. It is just a
display feature.
---
 example/example.php                   | 20 ++++++++++++++++++++
 lib/Diff.php                          | 12 +++++++++---
 lib/Diff/Renderer/Html/Inline.php     |  6 +++---
 lib/Diff/Renderer/Html/SideBySide.php |  6 +++---
 4 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/example/example.php b/example/example.php
index 234bc2c8..690cf868 100644
--- a/example/example.php
+++ b/example/example.php
@@ -24,6 +24,12 @@
 			//'ignoreCase' => true,
 		);
 
+		// Options for the renderer (change labels)
+		$renderer_options = array(
+			'old'=> 'Production',
+			'new'=>	'Development'
+		);
+
 		// Initialize the diff class
 		$diff = new Diff($a, $b, $options);
 
@@ -36,6 +42,13 @@
 		$renderer = new Diff_Renderer_Html_SideBySide;
 		echo $diff->Render($renderer);
 
+		?>
+		<h2>Side by Side Diff with custom labels</h2>
+		<?php
+
+		// Generate a side by side diff with custom labels
+		echo $diff->Render($renderer, $renderer_options);
+
 		?>
 		<h2>Inline Diff</h2>
 		<?php
@@ -45,6 +58,13 @@
 		$renderer = new Diff_Renderer_Html_Inline;
 		echo $diff->render($renderer);
 
+		?>
+		<h2>Inline Diff with custom labels</h2>
+		<?php
+
+		// Generate an inline diff with custom labels
+		echo $diff->render($renderer, $renderer_options);
+
 		?>
 		<h2>Unified Diff</h2>
 		<pre><?php
diff --git a/lib/Diff.php b/lib/Diff.php
index d1eb9da0..77dff799 100644
--- a/lib/Diff.php
+++ b/lib/Diff.php
@@ -67,7 +67,9 @@ class Diff
 		'context' => 3,
 		'ignoreNewLines' => false,
 		'ignoreWhitespace' => false,
-		'ignoreCase' => false
+		'ignoreCase' => false,
+		'old' => false,
+		'new' => false,
 	);
 
 	/**
@@ -98,10 +100,14 @@ public function __construct($a, $b, $options=array())
 	 * @param object $renderer An instance of the rendering object to use for generating the diff.
 	 * @return mixed The generated diff. Exact return value depends on the rendered.
 	 */
-	public function render(Diff_Renderer_Abstract $renderer)
+	public function render(Diff_Renderer_Abstract $renderer,$renderer_options=false)
 	{
 		$renderer->diff = $this;
-		return $renderer->render();
+		if($renderer_options) {
+			return $renderer->render($renderer_options);
+		} else {
+			return $renderer->render();
+		}
 	}
 
 	/**
diff --git a/lib/Diff/Renderer/Html/Inline.php b/lib/Diff/Renderer/Html/Inline.php
index 60e8005a..307d1dd8 100644
--- a/lib/Diff/Renderer/Html/Inline.php
+++ b/lib/Diff/Renderer/Html/Inline.php
@@ -50,7 +50,7 @@ class Diff_Renderer_Html_Inline extends Diff_Renderer_Html_Array
 	 *
 	 * @return string The generated inline diff.
 	 */
-	public function render()
+	public function render($renderer_options=array())
 	{
 		$changes = parent::render();
 		$html = '';
@@ -61,8 +61,8 @@ public function render()
 		$html .= '<table class="Differences DifferencesInline">';
 		$html .= '<thead>';
 		$html .= '<tr>';
-		$html .= '<th>Old</th>';
-		$html .= '<th>New</th>';
+		$html .= '<th>'.(!empty($renderer_options['old']) ? htmlspecialchars($renderer_options['old']) :'Old').'</th>';
+		$html .= '<th>'.(!empty($renderer_options['new']) ? htmlspecialchars($renderer_options['new']) :'New').'</th>';
 		$html .= '<th>Differences</th>';
 		$html .= '</tr>';
 		$html .= '</thead>';
diff --git a/lib/Diff/Renderer/Html/SideBySide.php b/lib/Diff/Renderer/Html/SideBySide.php
index 307af1c3..cddc303b 100644
--- a/lib/Diff/Renderer/Html/SideBySide.php
+++ b/lib/Diff/Renderer/Html/SideBySide.php
@@ -50,7 +50,7 @@ class Diff_Renderer_Html_SideBySide extends Diff_Renderer_Html_Array
 	 *
 	 * @return string The generated side by side diff.
 	 */
-	public function render()
+	public function render($renderer_options=array())
 	{
 		$changes = parent::render();
 
@@ -62,8 +62,8 @@ public function render()
 		$html .= '<table class="Differences DifferencesSideBySide">';
 		$html .= '<thead>';
 		$html .= '<tr>';
-		$html .= '<th colspan="2">Old Version</th>';
-		$html .= '<th colspan="2">New Version</th>';
+		$html .= '<th colspan="2">'.(!empty($renderer_options['old']) ? htmlspecialchars($renderer_options['old']) :'Old Version').'</th>';
+		$html .= '<th colspan="2">'.(!empty($renderer_options['new']) ? htmlspecialchars($renderer_options['new']) :'New Version').'</th>';
 		$html .= '</tr>';
 		$html .= '</thead>';
 		foreach($changes as $i => $blocks) {