composer.json - De-fork dependency, marcj/topsort #11687
Merged
Conversation
This file contains 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
When this dependency was originally added, we needed a few patches (for PHP 5.3 compatibility) and initially used a forked version of library. Of course, it's undesirable to use a fork in the long term (e.g. harder to apply upgrades; harder to merge into other build processes). In the intervening period, upstream has merged the patches for PHP 5.3, and we've politely asked downstream to get over PHP 5.3, so we're covered on both ends. Let's get back on the mainline branch!
|
Changes look fine to me and i know there are unit tests on the composer.lock file to ensure compatibility as well. I'm happy with this 👍 |
|
Tests have passed now this looks good to merge @eileenmcnaughton @colemanw |
|
merging based on @seamuslee001 analysis |
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.
Overview
When this dependency was originally added, we needed a few patches (for PHP 5.3 compatibility)
and initially used a forked version of library. Of course, it's undesirable to use a fork
in the long term (e.g. harder to apply upgrades; harder to merge into other build processes).
In the intervening period, upstream has merged the patches for PHP 5.3, and
we've politely asked downstream to get over PHP 5.3, so we're covered on
both ends. Let's get back on the mainline branch!
Before
civicrm-corepulls in a forked build ofmarcj/topsort.After
civicrm-corepulls in a conventional build ofmarcj/topsort.Comments
There should be test-coverage in
tests/phpunit/CRM/Extension/whichtouches on core's use of this library.