Side by side diff shows only partially all deleted lines

[vendeeglobe]

This happens only occasionally within the side by side diff mode.

php-diff: v1.16
WackoWiki 6.0.7

[JBlond]

That is a css problem. @vendeeglobe Please inspect which WackoWiki css rule overrides the css rule from php-diff.

[vendeeglobe]

But then the missing lines should show up in the HTML and they are not.

I can provide other examples.

[DigiLive]

Can you provide sample texts, so we can use them at our systems?

[vendeeglobe]

The text files with the source text for each revision.

Example 1:
example-1_r136.txt
example-1_r138.txt

Example 2:
example-2_r45.txt
example-2_r50.txt

Examples can be use freely.
Here you can see that the same source is passed for both modes:
https://github.com/WackoWiki/wackowiki/blob/master/wacko/handler/page/diff.php#L336

[DigiLive]

Since commit c017af5, the string for the table rows of deleted lines are defined with the heredoc syntax at method SideBySide::generateTableRowsDelete().

The concatenation is accidentally dropped with this change, which results in only returning the last row instead of all deleted rows.

I'll fix this bug, update the tests, examples and readme file and make PR.

[DigiLive]

I've made a PR which is waiting on JBlond to be reviewed and merged.

[JBlond]

@vendeeglobe There is now a release for it.

[JBlond]

@DigiLive I checked out 3e243f1 the last commit before the merge fix. I wonder why the phpunit test didn't fail.

[vendeeglobe]

Thanks for patching.

[DigiLive]

@DigiLive I checked out 3e243f1 the last commit before the merge fix. I wonder why the phpunit test didn't fail.

Theoretically...

• In that commit, the sample texts and the resulting texts are generated by us. The test is comparing them to match to each other. So we must make sure all have the correct content.
• In the sample texts of that commit there's only a block with 1 deleted line.
  Having only 1 deleted line, there's no need to concatenate.

$html1 = 'OneDeletedLine'
$html2 .= 'OneDeletedLine'
// $html2 == $html1

Therefor, I've updated the sample text to a block of 2 deleted lines.

$html1 = 'fisrtDeletedLine';
$html1 = 'SecondDeletedLine';
$html2 .= 'fisrtDeletedLine';
$html2 .= 'secondDeletedLine';
// $html2 != $html1
// 'fisrtDeletedLineSecondDeletedLine' != 'SecondDeletedLine'

You might want to add more lines for the other type of changes as well (equal, inserted, replaced lines). Another (and maybe easier) method is to mock some of the classes.