1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
|
<?php
include __DIR__ . '/demo_base.php';
use Jfcherng\Diff\DiffHelper;
use Jfcherng\Diff\Factory\RendererFactory;
?>
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8" />
<title>jfcherng/php-diff - Examples</title>
<!-- Prism -->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1/themes/prism-okaidia.min.css" />
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/prismjs@1/plugins/line-numbers/prism-line-numbers.min.css" />
<style type="text/css">
html {
font-size: 13px;
}
.token.coord {
color: #6cf;
}
.token.diff.bold {
color: #fb0;
font-weight: normal;
}
<?php echo DiffHelper::getStyleSheet(); ?>
</style>
</head>
<body>
<h1>None-level Diff</h1>
<?php
// demo the no-inline-detail diff
$inlineResult = DiffHelper::calculate(
$oldString,
$newString,
'Inline',
$diffOptions,
['detailLevel' => 'none'] + $rendererOptions
);
echo $inlineResult;
?>
<h1>Line-level Diff (Default)</h1>
<?php
// demo the word-level diff
$inlineResult = DiffHelper::calculate(
$oldString,
$newString,
'Inline',
$diffOptions,
['detailLevel' => 'line'] + $rendererOptions
);
echo $inlineResult;
?>
<h1>Word-level Diff</h1>
<?php
// demo the word-level diff
$inlineResult = DiffHelper::calculate(
$oldString,
$newString,
'Inline',
$diffOptions,
['detailLevel' => 'word'] + $rendererOptions
);
echo $inlineResult;
?>
<h1>Character-level Diff</h1>
<?php
// demo the character-level diff
$inlineResult = DiffHelper::calculate(
$oldString,
$newString,
'Inline',
$diffOptions,
['detailLevel' => 'char'] + $rendererOptions
);
echo $inlineResult;
?>
<h1>Side by Side Diff</h1>
<?php
// generate a side by side diff
$sideBySideResult = DiffHelper::calculateFiles(
$oldFile,
$newFile,
'SideBySide',
$diffOptions,
$rendererOptions
);
echo $sideBySideResult;
?>
<h1>Inline Diff</h1>
<?php
// generate an inline diff
$inlineResult = DiffHelper::calculateFiles(
$oldFile,
$newFile,
'Inline',
$diffOptions,
$rendererOptions
);
echo $inlineResult;
?>
<h1>Combined Diff</h1>
<?php
// generate a combined diff
$sideBySideResult = DiffHelper::calculateFiles(
$oldFile,
$newFile,
'Combined',
$diffOptions,
$rendererOptions
);
echo $sideBySideResult;
?>
<h1>Unified Diff</h1>
<pre><code class="language-diff line-numbers"><?php
// generate a unified diff
$unifiedResult = DiffHelper::calculateFiles(
$oldFile,
$newFile,
'Unified',
$diffOptions,
$rendererOptions
);
echo \htmlspecialchars($unifiedResult);
?></code></pre>
<h1>Context Diff</h1>
<pre><code class="language-diff line-numbers"><?php
// generate a context diff
$contextResult = DiffHelper::calculateFiles(
$oldFile,
$newFile,
'Context',
$diffOptions,
$rendererOptions
);
echo \htmlspecialchars($contextResult);
?></code></pre>
<?php
// change JSON output settings for better human reading
$rendererOptions['outputTagAsString'] = true;
$rendererOptions['jsonEncodeFlags'] |= \JSON_PRETTY_PRINT;
?>
<h1>Text JSON Diff</h1>
<pre><code class="language-json line-numbers"><?php
// generate a plain text JSON diff
$jsonResult = DiffHelper::calculateFiles(
$oldFile,
$newFile,
'JsonText',
$diffOptions,
$rendererOptions
);
echo \htmlspecialchars($jsonResult);
?></code></pre>
<h1>HTML JSON Diff</h1>
<pre><code class="language-json line-numbers"><?php
// generate a HTML JSON diff
$jsonResult = DiffHelper::calculateFiles(
$oldFile,
$newFile,
'JsonHtml',
$diffOptions,
$rendererOptions
);
echo \htmlspecialchars($jsonResult);
?></code></pre>
<h1>HTML Diff from the Result of JSON Diff</h1>
<?php
$jsonArray = \json_decode($jsonResult, true);
$htmlRenderer = RendererFactory::make('Inline', $rendererOptions);
$inlineResult = $htmlRenderer->renderArray($jsonArray);
echo $inlineResult;
?>
<!-- Prism -->
<script src="https://cdn.jsdelivr.net/npm/prismjs@1/prism.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/prismjs@1/components/prism-diff.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/prismjs@1/components/prism-json.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/prismjs@1/plugins/line-numbers/prism-line-numbers.min.js"></script>
</body>
</html>
|
