@@ -209,46 +209,32 @@ protected function renderTableReplace(array $change): string
209
209
{
210
210
$ html = '' ;
211
211
212
- if (\count ($ change ['old ' ]['lines ' ]) >= \count ($ change ['new ' ]['lines ' ])) {
213
- foreach ($ change ['old ' ]['lines ' ] as $ no => $ oldLine ) {
214
- $ oldLineNum = $ change ['old ' ]['offset ' ] + $ no + 1 ;
215
-
216
- if (isset ($ change ['new ' ]['lines ' ][$ no ])) {
217
- $ newLineNum = $ change ['new ' ]['offset ' ] + $ no + 1 ;
218
- $ newLine = '<span> ' . $ change ['new ' ]['lines ' ][$ no ] . '</span> ' ;
219
- } else {
220
- $ newLineNum = null ;
221
- $ newLine = '' ;
222
- }
212
+ $ lineCountMax = \max (\count ($ change ['old ' ]['lines ' ]), \count ($ change ['new ' ]['lines ' ]));
223
213
224
- $ html .=
225
- ' <tr> ' .
226
- $ this -> renderLineNumberColumn ( 'old ' , $ oldLineNum ) .
227
- ' <td class=" old"><span> ' . $ oldLine . ' </span></td> ' .
228
- $ this -> renderLineNumberColumn ( ' new ' , $ newLineNum ) .
229
- ' <td class="new"> ' . $ newLine . ' </td> ' .
230
- ' </tr> ' ;
214
+ for ( $ no = 0 ; $ no < $ lineCountMax ; ++ $ no ) {
215
+ if ( isset ( $ change [ ' old ' ][ ' lines ' ][ $ no ])) {
216
+ $ oldLineNum = $ change [ 'old ' ][ ' offset ' ] + $ no + 1 ;
217
+ $ oldLine = $ change [ ' old ' ][ ' lines ' ][ $ no ];
218
+ } else {
219
+ $ oldLineNum = null ;
220
+ $ oldLine = ' ' ;
231
221
}
232
- } else {
233
- foreach ($ change ['new ' ]['lines ' ] as $ no => $ newLine ) {
234
- $ newLineNum = $ change ['new ' ]['offset ' ] + $ no + 1 ;
235
222
236
- if (isset ($ change ['old ' ]['lines ' ][$ no ])) {
237
- $ oldLineNum = $ change ['old ' ]['offset ' ] + $ no + 1 ;
238
- $ oldLine = '<span> ' . $ change ['old ' ]['lines ' ][$ no ] . '</span> ' ;
239
- } else {
240
- $ oldLineNum = null ;
241
- $ oldLine = '' ;
242
- }
243
-
244
- $ html .=
245
- '<tr> ' .
246
- $ this ->renderLineNumberColumn ('old ' , $ oldLineNum ) .
247
- '<td class="old"><span> ' . $ oldLine . '</span></td> ' .
248
- $ this ->renderLineNumberColumn ('new ' , $ newLineNum ) .
249
- '<td class="new"> ' . $ newLine . '</td> ' .
250
- '</tr> ' ;
223
+ if (isset ($ change ['new ' ]['lines ' ][$ no ])) {
224
+ $ newLineNum = $ change ['new ' ]['offset ' ] + $ no + 1 ;
225
+ $ newLine = $ change ['new ' ]['lines ' ][$ no ];
226
+ } else {
227
+ $ newLineNum = null ;
228
+ $ newLine = '' ;
251
229
}
230
+
231
+ $ html .=
232
+ '<tr> ' .
233
+ $ this ->renderLineNumberColumn ('old ' , $ oldLineNum ) .
234
+ '<td class="old"> ' . $ oldLine . '</td> ' .
235
+ $ this ->renderLineNumberColumn ('new ' , $ newLineNum ) .
236
+ '<td class="new"> ' . $ newLine . '</td> ' .
237
+ '</tr> ' ;
252
238
}
253
239
254
240
return $ html ;
0 commit comments