Skip to content

Fix #90 - Diff mode Merged shows result only partially #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 27, 2021
Merged

Conversation

DigiLive
Copy link
Collaborator

This PR is supposed to fix #90 and also contains some other fixes of the HTML Merged renderer class which where found along the way.
It also closes #91 since the generated notice as described at that issue isn't related to php v.8.0, but to issue #90.

* Some background colors made did not match between the two versions.
* Some foreground colors blended into the background color.
* Color styles added for HTML Merged Renderer.
* Renderer doesn't show lines which where added to version 2 of a
  replaced block. Code assumed the same amount of lines in replacement
  blocks at both versions. Now it handles replacement block differently
  when the amount of lines are equal or differs.
* Code cleanup.
* ClassName for lines of replacement blocks are incorrect. Insertion
  is insinuated, but should be replacement.
Line headers of each equal or inserted line were given a class where it
was supposed to be only the first line.
* Some values of title attributes had hardcoded references to one of
  the compared versions of text. They now refer to these versions using
  the titles as set in the renderers options.
* Values can contain character sequences that break the HTML output of
  the renderer. The characters are now converted to HTML entities.
Code changes of the HTML merged renderer causes different output.
The expected output for the phpunit test of this renderer is refactored
to reflect those changes.
@DigiLive DigiLive requested a review from JBlond March 27, 2021 11:20
@DigiLive DigiLive self-assigned this Mar 27, 2021
@DigiLive DigiLive added the bug label Mar 27, 2021
@JBlond JBlond marked this pull request as ready for review March 27, 2021 13:31
@JBlond JBlond merged commit 2d0145d into master Mar 27, 2021
@JBlond JBlond deleted the php-diff-90 branch March 27, 2021 13:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Warning thrown at php v8.0 Diff mode Merged shows result only partially
2 participants