|
12 | 12 |
|
13 | 13 | use Jfcherng\Diff\DiffHelper; |
14 | 14 |
|
15 | | - // include two sample files for comparison |
16 | | - $a = \file_get_contents(__DIR__ . '/a.txt'); |
17 | | - $b = \file_get_contents(__DIR__ . '/b.txt'); |
18 | | - |
19 | 15 | // sample string for comparison |
20 | 16 | $old = "\$old = 'This is the old string.';"; |
21 | 17 | $new = "\$new = 'And this is the new one.';"; |
22 | 18 |
|
| 19 | + // sample string for comparison |
| 20 | + $old_u8 = '內存不足!沒法在視頻聊天時播放視頻。'; |
| 21 | + $new_u8 = '記憶體不足!沒辦法在視訊聊天時播放影片。'; |
| 22 | + |
| 23 | + // include two sample files for comparison |
| 24 | + $old_file = \file_get_contents(__DIR__ . '/old_file.txt'); |
| 25 | + $new_file = \file_get_contents(__DIR__ . '/new_file.txt'); |
| 26 | + |
23 | 27 | // options for Diff class |
24 | 28 | $diffOptions = [ |
25 | 29 | // show how many neighbor lines |
|
48 | 52 |
|
49 | 53 | ?> |
50 | 54 |
|
| 55 | + <h1>UTF-8 Ready</h1> |
| 56 | + <?php |
| 57 | + |
| 58 | + // demo the UTF-8 diff |
| 59 | + $result = DiffHelper::calculate( |
| 60 | + $old_u8, |
| 61 | + $new_u8, |
| 62 | + 'Inline', |
| 63 | + $diffOptions, |
| 64 | + ['detailLevel' => 'char'] + $templateOptions |
| 65 | + ); |
| 66 | + |
| 67 | + echo $result; |
| 68 | + |
| 69 | + ?> |
| 70 | + |
51 | 71 | <h1>None-level Diff</h1> |
52 | 72 | <?php |
53 | 73 |
|
|
116 | 136 | <?php |
117 | 137 |
|
118 | 138 | // generate a side by side diff |
119 | | - $result = DiffHelper::calculate($a, $b, 'SideBySide', $diffOptions, $templateOptions); |
| 139 | + $result = DiffHelper::calculate($old_file, $new_file, 'SideBySide', $diffOptions, $templateOptions); |
120 | 140 |
|
121 | 141 | echo $result; |
122 | 142 |
|
|
126 | 146 | <?php |
127 | 147 |
|
128 | 148 | // generate an inline diff |
129 | | - $result = DiffHelper::calculate($a, $b, 'Inline', $diffOptions, $templateOptions); |
| 149 | + $result = DiffHelper::calculate($old_file, $new_file, 'Inline', $diffOptions, $templateOptions); |
130 | 150 |
|
131 | 151 | echo $result; |
132 | 152 |
|
|
136 | 156 | <pre><?php |
137 | 157 |
|
138 | 158 | // generate a unified diff |
139 | | - $result = DiffHelper::calculate($a, $b, 'Unified', $diffOptions, $templateOptions); |
| 159 | + $result = DiffHelper::calculate($old_file, $new_file, 'Unified', $diffOptions, $templateOptions); |
140 | 160 |
|
141 | 161 | echo \htmlspecialchars($result); |
142 | 162 |
|
|
146 | 166 | <pre><?php |
147 | 167 |
|
148 | 168 | // generate a context diff |
149 | | - $result = DiffHelper::calculate($a, $b, 'Context', $diffOptions, $templateOptions); |
| 169 | + $result = DiffHelper::calculate($old_file, $new_file, 'Context', $diffOptions, $templateOptions); |
150 | 170 |
|
151 | 171 | echo \htmlspecialchars($result); |
152 | 172 |
|
|
0 commit comments