Skip to content

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

Merged
merged 26 commits into from
Jan 23, 2020

Conversation

DigiLive
Copy link
Collaborator

Please review the changes and feedback any questions or remarks.

JBlond and others added 26 commits December 3, 2019 18:20
- 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 JBlond merged commit d445336 into master Jan 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants