|
46 | 46 | ['detailLevel' => 'none'] + $rendererOptions, |
47 | 47 | ); |
48 | 48 |
|
49 | | -echo $inlineResult; |
| 49 | + echo $inlineResult; |
50 | 50 |
|
51 | | -?> |
| 51 | + ?> |
52 | 52 |
|
53 | 53 | <h1>Line-level Diff (Default)</h1> |
54 | 54 | <?php |
55 | 55 |
|
56 | | -// demo the word-level diff |
57 | | -$inlineResult = DiffHelper::calculate( |
58 | | - $oldString, |
59 | | - $newString, |
60 | | - 'Inline', |
61 | | - $diffOptions, |
62 | | - ['detailLevel' => 'line'] + $rendererOptions, |
63 | | -); |
| 56 | + // demo the word-level diff |
| 57 | + $inlineResult = DiffHelper::calculate( |
| 58 | + $oldString, |
| 59 | + $newString, |
| 60 | + 'Inline', |
| 61 | + $diffOptions, |
| 62 | + ['detailLevel' => 'line'] + $rendererOptions, |
| 63 | + ); |
64 | 64 |
|
65 | | -echo $inlineResult; |
| 65 | + echo $inlineResult; |
66 | 66 |
|
67 | | -?> |
| 67 | + ?> |
68 | 68 |
|
69 | 69 | <h1>Word-level Diff</h1> |
70 | 70 | <?php |
71 | 71 |
|
72 | | -// demo the word-level diff |
73 | | -$inlineResult = DiffHelper::calculate( |
74 | | - $oldString, |
75 | | - $newString, |
76 | | - 'Inline', |
77 | | - $diffOptions, |
78 | | - ['detailLevel' => 'word'] + $rendererOptions, |
79 | | -); |
| 72 | + // demo the word-level diff |
| 73 | + $inlineResult = DiffHelper::calculate( |
| 74 | + $oldString, |
| 75 | + $newString, |
| 76 | + 'Inline', |
| 77 | + $diffOptions, |
| 78 | + ['detailLevel' => 'word'] + $rendererOptions, |
| 79 | + ); |
80 | 80 |
|
81 | | -echo $inlineResult; |
| 81 | + echo $inlineResult; |
82 | 82 |
|
83 | | -?> |
| 83 | + ?> |
84 | 84 |
|
85 | 85 | <h1>Character-level Diff</h1> |
86 | 86 | <?php |
87 | 87 |
|
88 | | -// demo the character-level diff |
89 | | -$inlineResult = DiffHelper::calculate( |
90 | | - $oldString, |
91 | | - $newString, |
92 | | - 'Inline', |
93 | | - $diffOptions, |
94 | | - ['detailLevel' => 'char'] + $rendererOptions, |
95 | | -); |
| 88 | + // demo the character-level diff |
| 89 | + $inlineResult = DiffHelper::calculate( |
| 90 | + $oldString, |
| 91 | + $newString, |
| 92 | + 'Inline', |
| 93 | + $diffOptions, |
| 94 | + ['detailLevel' => 'char'] + $rendererOptions, |
| 95 | + ); |
96 | 96 |
|
97 | | -echo $inlineResult; |
| 97 | + echo $inlineResult; |
98 | 98 |
|
99 | | -?> |
| 99 | + ?> |
100 | 100 |
|
101 | 101 | <h1>Side by Side Diff</h1> |
102 | 102 | <?php |
103 | 103 |
|
104 | | -// generate a side by side diff |
105 | | -$sideBySideResult = DiffHelper::calculateFiles( |
106 | | - $oldFile, |
107 | | - $newFile, |
108 | | - 'SideBySide', |
109 | | - $diffOptions, |
110 | | - $rendererOptions, |
111 | | -); |
| 104 | + // generate a side by side diff |
| 105 | + $sideBySideResult = DiffHelper::calculateFiles( |
| 106 | + $oldFile, |
| 107 | + $newFile, |
| 108 | + 'SideBySide', |
| 109 | + $diffOptions, |
| 110 | + $rendererOptions, |
| 111 | + ); |
112 | 112 |
|
113 | | -echo $sideBySideResult; |
| 113 | + echo $sideBySideResult; |
114 | 114 |
|
115 | | -?> |
| 115 | + ?> |
116 | 116 |
|
117 | 117 | <h1>Inline Diff</h1> |
118 | 118 | <?php |
119 | 119 |
|
120 | | -// generate an inline diff |
121 | | -$inlineResult = DiffHelper::calculateFiles( |
122 | | - $oldFile, |
123 | | - $newFile, |
124 | | - 'Inline', |
125 | | - $diffOptions, |
126 | | - $rendererOptions, |
127 | | -); |
| 120 | + // generate an inline diff |
| 121 | + $inlineResult = DiffHelper::calculateFiles( |
| 122 | + $oldFile, |
| 123 | + $newFile, |
| 124 | + 'Inline', |
| 125 | + $diffOptions, |
| 126 | + $rendererOptions, |
| 127 | + ); |
128 | 128 |
|
129 | | -echo $inlineResult; |
| 129 | + echo $inlineResult; |
130 | 130 |
|
131 | | -?> |
| 131 | + ?> |
132 | 132 |
|
133 | 133 | <h1>Combined Diff</h1> |
134 | 134 | <?php |
135 | 135 |
|
136 | | -// generate a combined diff |
137 | | -$sideBySideResult = DiffHelper::calculateFiles( |
138 | | - $oldFile, |
139 | | - $newFile, |
140 | | - 'Combined', |
141 | | - $diffOptions, |
142 | | - $rendererOptions, |
143 | | -); |
| 136 | + // generate a combined diff |
| 137 | + $sideBySideResult = DiffHelper::calculateFiles( |
| 138 | + $oldFile, |
| 139 | + $newFile, |
| 140 | + 'Combined', |
| 141 | + $diffOptions, |
| 142 | + $rendererOptions, |
| 143 | + ); |
144 | 144 |
|
145 | | -echo $sideBySideResult; |
| 145 | + echo $sideBySideResult; |
146 | 146 |
|
147 | | -?> |
| 147 | + ?> |
148 | 148 |
|
149 | 149 | <h1>Unified Diff</h1> |
150 | 150 | <pre><code class="language-diff line-numbers"><?php |
151 | 151 |
|
152 | | -// generate a unified diff |
153 | | -$unifiedResult = DiffHelper::calculateFiles( |
154 | | - $oldFile, |
155 | | - $newFile, |
156 | | - 'Unified', |
157 | | - $diffOptions, |
158 | | - $rendererOptions, |
159 | | -); |
| 152 | + // generate a unified diff |
| 153 | + $unifiedResult = DiffHelper::calculateFiles( |
| 154 | + $oldFile, |
| 155 | + $newFile, |
| 156 | + 'Unified', |
| 157 | + $diffOptions, |
| 158 | + $rendererOptions, |
| 159 | + ); |
160 | 160 |
|
161 | | -echo htmlspecialchars($unifiedResult); |
| 161 | + echo htmlspecialchars($unifiedResult); |
162 | 162 |
|
163 | | -?></code></pre> |
| 163 | + ?></code></pre> |
164 | 164 |
|
165 | 165 | <h1>Context Diff</h1> |
166 | 166 | <pre><code class="language-diff line-numbers"><?php |
167 | 167 |
|
168 | | -// generate a context diff |
169 | | -$contextResult = DiffHelper::calculateFiles( |
170 | | - $oldFile, |
171 | | - $newFile, |
172 | | - 'Context', |
173 | | - $diffOptions, |
174 | | - $rendererOptions, |
175 | | -); |
| 168 | + // generate a context diff |
| 169 | + $contextResult = DiffHelper::calculateFiles( |
| 170 | + $oldFile, |
| 171 | + $newFile, |
| 172 | + 'Context', |
| 173 | + $diffOptions, |
| 174 | + $rendererOptions, |
| 175 | + ); |
176 | 176 |
|
177 | | -echo htmlspecialchars($contextResult); |
| 177 | + echo htmlspecialchars($contextResult); |
178 | 178 |
|
179 | | -?></code></pre> |
| 179 | + ?></code></pre> |
180 | 180 |
|
181 | 181 | <?php |
182 | 182 |
|
183 | | -// change JSON output settings for better human reading |
184 | | -$rendererOptions['outputTagAsString'] = true; |
185 | | -$rendererOptions['jsonEncodeFlags'] |= \JSON_PRETTY_PRINT; |
| 183 | + // change JSON output settings for better human reading |
| 184 | + $rendererOptions['outputTagAsString'] = true; |
| 185 | + $rendererOptions['jsonEncodeFlags'] |= \JSON_PRETTY_PRINT; |
186 | 186 |
|
187 | | -?> |
| 187 | + ?> |
188 | 188 |
|
189 | 189 | <h1>Text JSON Diff</h1> |
190 | 190 | <pre><code class="language-json line-numbers"><?php |
191 | 191 |
|
192 | | -// generate a plain text JSON diff |
193 | | -$jsonResult = DiffHelper::calculateFiles( |
194 | | - $oldFile, |
195 | | - $newFile, |
196 | | - 'JsonText', |
197 | | - $diffOptions, |
198 | | - $rendererOptions, |
199 | | -); |
| 192 | + // generate a plain text JSON diff |
| 193 | + $jsonResult = DiffHelper::calculateFiles( |
| 194 | + $oldFile, |
| 195 | + $newFile, |
| 196 | + 'JsonText', |
| 197 | + $diffOptions, |
| 198 | + $rendererOptions, |
| 199 | + ); |
200 | 200 |
|
201 | | -echo htmlspecialchars($jsonResult); |
| 201 | + echo htmlspecialchars($jsonResult); |
202 | 202 |
|
203 | | -?></code></pre> |
| 203 | + ?></code></pre> |
204 | 204 |
|
205 | 205 | <h1>HTML JSON Diff</h1> |
206 | 206 | <pre><code class="language-json line-numbers"><?php |
207 | 207 |
|
208 | | -// generate a HTML JSON diff |
209 | | -$jsonResult = DiffHelper::calculateFiles( |
210 | | - $oldFile, |
211 | | - $newFile, |
212 | | - 'JsonHtml', |
213 | | - $diffOptions, |
214 | | - $rendererOptions, |
215 | | -); |
| 208 | + // generate a HTML JSON diff |
| 209 | + $jsonResult = DiffHelper::calculateFiles( |
| 210 | + $oldFile, |
| 211 | + $newFile, |
| 212 | + 'JsonHtml', |
| 213 | + $diffOptions, |
| 214 | + $rendererOptions, |
| 215 | + ); |
216 | 216 |
|
217 | | -echo htmlspecialchars($jsonResult); |
| 217 | + echo htmlspecialchars($jsonResult); |
218 | 218 |
|
219 | | -?></code></pre> |
| 219 | + ?></code></pre> |
220 | 220 |
|
221 | 221 | <h1>HTML Diff from the Result of JSON Diff</h1> |
222 | 222 | <?php |
223 | 223 |
|
224 | | -$jsonArray = json_decode($jsonResult, true); |
| 224 | + $jsonArray = json_decode($jsonResult, true); |
225 | 225 |
|
226 | | -$htmlRenderer = RendererFactory::make('Inline', $rendererOptions); |
227 | | -$inlineResult = $htmlRenderer->renderArray($jsonArray); |
| 226 | + $htmlRenderer = RendererFactory::make('Inline', $rendererOptions); |
| 227 | + $inlineResult = $htmlRenderer->renderArray($jsonArray); |
228 | 228 |
|
229 | | -echo $inlineResult; |
| 229 | + echo $inlineResult; |
230 | 230 |
|
231 | | -?> |
| 231 | + ?> |
232 | 232 |
|
233 | 233 | <!-- Prism --> |
234 | 234 | <script src="https://cdn.jsdelivr.net/npm/prismjs@1/prism.min.js"></script> |
|
0 commit comments