summaryrefslogtreecommitdiffstats
path: root/php-diff-example.patch
diff options
context:
space:
mode:
Diffstat (limited to 'php-diff-example.patch')
-rw-r--r--php-diff-example.patch50
1 files changed, 50 insertions, 0 deletions
diff --git a/php-diff-example.patch b/php-diff-example.patch
new file mode 100644
index 0000000..8f2d906
--- /dev/null
+++ b/php-diff-example.patch
@@ -0,0 +1,50 @@
+diff -up example/example.php.old example/example.php
+--- example/example.php.old 2015-02-17 13:26:45.000000000 +0100
++++ example/example.php 2015-02-17 13:27:34.000000000 +0100
+@@ -11,8 +11,8 @@
+ <hr />
+ <?php
+
+- // Include the diff class
+- require_once dirname(__FILE__).'/../lib/Diff.php';
++ // Include the autoloader
++ require_once 'phpspec/php-diff/autoload.php';
+
+ // Include two sample files for comparison
+ $a = explode("\n", file_get_contents(dirname(__FILE__).'/a.txt'));
+@@ -31,8 +31,6 @@
+ <h2>Side by Side Diff</h2>
+ <?php
+
+- // Generate a side by side diff
+- require_once dirname(__FILE__).'/../lib/Diff/Renderer/Html/SideBySide.php';
+ $renderer = new Diff_Renderer_Html_SideBySide;
+ echo $diff->Render($renderer);
+
+@@ -40,8 +38,6 @@
+ <h2>Inline Diff</h2>
+ <?php
+
+- // Generate an inline diff
+- require_once dirname(__FILE__).'/../lib/Diff/Renderer/Html/Inline.php';
+ $renderer = new Diff_Renderer_Html_Inline;
+ echo $diff->render($renderer);
+
+@@ -49,8 +45,6 @@
+ <h2>Unified Diff</h2>
+ <pre><?php
+
+- // Generate a unified diff
+- require_once dirname(__FILE__).'/../lib/Diff/Renderer/Text/Unified.php';
+ $renderer = new Diff_Renderer_Text_Unified;
+ echo htmlspecialchars($diff->render($renderer));
+
+@@ -59,8 +53,6 @@
+ <h2>Context Diff</h2>
+ <pre><?php
+
+- // Generate a context diff
+- require_once dirname(__FILE__).'/../lib/Diff/Renderer/Text/Context.php';
+ $renderer = new Diff_Renderer_Text_Context;
+ echo htmlspecialchars($diff->render($renderer));
+ ?>