@@ -15,11 +15,16 @@ A comprehensive library for generating diff between two strings.
15
15
16
16
Generated diff can be rendered in all of the standard formats including:
17
17
18
- - Unified (Text)
19
- - Context (Text)
20
- - Json (Text)
21
- - Inline (HTML)
22
- - Side by Side (HTML)
18
+ ** Text** renderers:
19
+
20
+ - Context
21
+ - Json
22
+ - Unified
23
+
24
+ ** HTML** renderers:
25
+
26
+ - Inline
27
+ - Side by Side
23
28
24
29
Note that for HTML rendered results, you have to add CSS for a better visualization.
25
30
You may modify one from ` example/diff-table.css ` or write your own from zero.
@@ -62,7 +67,9 @@ $newFile = __DIR__ . '/example/new_file.txt';
62
67
$old = 'This is the old string.';
63
68
$new = 'And this is the new one.';
64
69
65
- // renderer class name: Unified, Context, Json, Inline, SideBySide
70
+ // renderer class name:
71
+ // Text renderers: Context, Json, Unified
72
+ // HTML renderers: Inline, SideBySide
66
73
$rendererName = 'Unified';
67
74
68
75
// the Diff class options
@@ -147,17 +154,29 @@ $result = $htmlRenderer->renderArray(json_decode($jsonResult, true));
147
154
148
155
### Renderer: Inline
149
156
157
+ ``` php
158
+ <?php $rendererOptions = ['detailLevel' => 'line'];
159
+ ```
160
+
150
161
![ Inline] ( https://raw.githubusercontent.com/jfcherng/php-diff/v6/example/images/inline-renderer.png )
151
162
152
163
153
164
### Renderer: Side By Side
154
165
166
+ ``` php
167
+ <?php $rendererOptions = ['detailLevel' => 'line'];
168
+ ```
169
+
155
170
![ Side By Side] ( https://raw.githubusercontent.com/jfcherng/php-diff/v6/example/images/side-by-side-renderer.png )
156
171
157
172
158
- ### Renderer: Side By Side (` lineNumbers ` = ` false ` )
173
+ ### Renderer: Side By Side (no line numbers )
159
174
160
- ![ Side By Side] ( https://raw.githubusercontent.com/jfcherng/php-diff/v6/example/images/side-by-side-renderer-no-line-numbers.png )
175
+ ``` php
176
+ <?php $rendererOptions = ['lineNumbers' => false];
177
+ ```
178
+
179
+ ![ Side By Side] ( https://raw.githubusercontent.com/jfcherng/php-diff/v6/example/images/side-by-side-renderer-line-numbers-false.png )
161
180
162
181
163
182
### Renderer: Unified
@@ -184,7 +203,7 @@ $result = $htmlRenderer->renderArray(json_decode($jsonResult, true));
184
203
185
204
<details ><summary >Click to expand</summary >
186
205
187
- ```
206
+ ``` diff
188
207
***************
189
208
*** 1,3 ****
190
209
! <p>Hello World!</p>
0 commit comments