Backport "Use libxml version instead of PHP version before calling libxml_disable_entity_loader" #807
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
CarlSchwan
force-pushed
the
work/better_libxml_version_detection
branch
from
320d1bd to
13140c5
Compare
patches.txt
Outdated
| - SabreVObject: Broker: add timezone to CANCEL messages https://github.com/sabre-io/vobject/pull/412 | ||
| - SabreXML: Fix invalid PHP docs https://github.com/fruux/sabre-xml/pull/128 | ||
| - SabreXML: Prevent infinite loops for empty props element https://github.com/fruux/sabre-xml/pull/132 | ||
| - SabreXML: Use libxml version instead of PHP version before calling libxml_disable_entity_loader https://github.com/sabre-io/xml/pull/204 |
There was a problem hiding this comment.
Is patchs.txt actually still used? I can't remember applying any of those patches manually when I vendored deps. How do we ensure the patch doesn't get unapplied?
There was a problem hiding this comment.
yeah, it is indeed a problem. I think something like cweagans/composer-patches symplify/vendor-patches might be a good solution to vendor patches, I'd take a deeper look at these two packages this weekend.
There was a problem hiding this comment.
This is now using cweagans/composer-patches and it seems to work, let see if the ci is happy with it
CarlSchwan
force-pushed
the
work/better_libxml_version_detection
branch
2 times, most recently
from
da13032 to
59af070
Compare
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
CarlSchwan
force-pushed
the
work/better_libxml_version_detection
branch
from
59af070 to
2a7884e
Compare
CarlSchwan
changed the title
kesselb
approved these changes
Oct 7, 2021
kesselb
reviewed
Oct 7, 2021
delete-merged-branch
bot
deleted the
work/better_libxml_version_detection
branch
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.
Backport sabre-io/xml#204
This also adds cweagans/composer-patches to make it possible to patch the vendor files without them getting overwritten the next time composer install is run.
Signed-off-by: Carl Schwan carl@carlschwan.eu