forked from chrisboulton/php-diff
-
Notifications
You must be signed in to change notification settings - Fork 4
Many code fixes, optimazations, cleanup, refactoring and commenting. #21
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
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Added gitignore file. - Added composer lock file.
1 The constructor now accepts both string and array values as data to compare to eachother. 2 Method Diff::setOptions() added to merge user defined options into the default options. 3 methods Diff::getOld() and Diff::getNew() now return an entire array. 4 Method Diff::getArrayRange() added. 5 Method Diff::getArgumentType() added. As a result of change 3 and 4, text renderers Context and Unified are also changed to keep functionality the same.
The tests verify if the ouput of the diff-view renderers remains as defined by the files in the resources folder. TestCase ArrayTest is renamed to HtmlArrayTest in moved to the Html subFolder.
A HTML Unified Renderer class is added. The example is updated so it includes this renderer.
- Removed unreachable code from Diff::getArgumentType(). - Updated readme files to include the Unified HTML diff-view, PHP >= 7.2 requirement and DigiLive as contributor. - Updated PHP >= 7.2 requirement in file docBlocks.
Fixes: Method HtmlArray::fixSpaces() replaced leading space characters with the wrong amount of ' ' characters instead of the amount of spaces as defined in HtmlArray::options. This method is removed and replacement of these spaces has moved to method HtmlArray::formatLines() wich replaces the leading spaces with the correct amount of non-breaking spaces (character ' ').
Resources of PHPUnit tests in HtmlArrayTest updated to be compatible with commit 6bc3f7c
Resources of PHPUnit HtmlRendererTest::testInline() updated to be compatible with commit e227356
…giLive � Conflicts: � tests/Diff/Renderer/Html/HtmlArrayTest.php
- Major fix: The HTML renderers are now able to collapse blocks of equal lines when using the 'context' option of the Diff class.
JBlond
approved these changes
Jan 23, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Please review the changes and feedback any questions or remarks.