search

vaimo / composer-patches

Applies a patch from a local or remote file to any package that is part of a given composer project. Patches can be defined both on project and on package level. Optional support for patch versioning, sequencing, custom patch applier configuration and composer command for testing/troubleshooting patches.
MIT License
290 stars 41 forks source link

GJZ-3 conflict marker for cweagans/composer-patches #94

Closed johnorourke closed 2 years ago

johnorourke commented 2 years ago

A partial solution for #66 - both modules use extra.patches but with different syntax, so if one module is installed and in use, and the other gets installed, unpredictable behaviour results without clear warnings.

(note - I tried creating a unit test for this, but couldn't get any tests to run after a few hours of hacking)

peterjaap commented 2 years ago

@zamoroka while you're merging, can you do this one as well? :)

johnorourke commented 2 years ago

Thanks @peterjaap and @zamoroka !