search

wikimedia / composer-merge-plugin

Merge one or more additional composer.json files at Composer runtime
MIT License
938 stars 160 forks source link

add merge-replace config #233

Closed mjauvin closed 2 years ago

mjauvin commented 2 years ago

Fix #221

This allows to control merging of composer replace section.

mjauvin commented 2 years ago

Is this project still maintained? There has been next to no activity for the past year.

LukeTowers commented 2 years ago

I've just gone with the approach of not including the Winter plugins in my projects' merge config.

mjauvin commented 2 years ago

@reedy I documented merge-replace in README.md

Thanks.

mjauvin commented 2 years ago

@reedy sorry, I checked the README.md file at line 111 and I don't understand what you mean by "make it optional"

mjauvin commented 2 years ago

@reedy If you mean the "*" in front of replace on line 111, this is for a bulletted list... not the usual "this is optional".

reedy commented 2 years ago
Screenshot 2022-08-23 at 16 39 14

For the other options where they have a config switch, like you're doing for replace, we've got documented that you can turn it on an off, including a link to the documentation section you added in the previous revision

mjauvin commented 2 years ago

@reedy sorry, brain cramp this morning... commit has been added for this.

Thanks.

mjauvin commented 2 years ago

@reedy anything else required to be modified for this?

reedy commented 2 years ago

Not unless you want to write some tests to test the merge-replace: false state ;)

I'd like to try and get https://github.com/wikimedia/composer-merge-plugin/issues/240 fixed so CI is actually useful before merging more new features (even though this one is trivial)...

mjauvin commented 2 years ago

@reedy Sure, fix your CI and I'll write a testcase.

LukeTowers commented 2 years ago

@reedy unless you're planning on taking care of #240 in the next week or so can we just get this PR merged for now? 😄 I know how easy it is for things to slip by the wayside for the sake of wishful thinking, so if you're willing to I'd really rather just get this simple change merged and then look at fixing CI later when someone actually has time to do it.

reedy commented 2 years ago

Haha. Fair point. I'll do it later today.

The tests confuse me tbh (I didn't write them!), and unless someone else looks at them and has any idea any time soon...

eileenmcnaughton commented 2 years ago

yay

wgevaert commented 2 years ago

great patch! When will this be released into a new version?

mjauvin commented 1 year ago

@reedy any way to tag a release so this can be used in stable composer installation?

Thanks.

reedy commented 1 year ago

@reedy any way to tag a release so this can be used in stable composer installation?

Thanks.

Sorry for the slow reply... I've created https://github.com/wikimedia/composer-merge-plugin/tree/v2 to revert out the dropping of old PHP support (but no CI due to supported images by GH Actions) and testing of 8.2 (because of different library requirements) to remove the more breaking changes in master... Ideally the next major release wants even more breaking changes (ie dropping composer 1.x support (ala https://github.com/wikimedia/composer-merge-plugin/issues/243).. But those code updates haven't been done yet.

And then turned that into https://github.com/wikimedia/composer-merge-plugin/releases/tag/v2.1.0

mjauvin commented 1 year ago

Hello Sam, I see a 2.1.0 tag, but no release yet... Am I too impatient ?

Thanks!

On Sat, Apr 15, 2023 at 3:12 PM Sam Reed @.***> wrote:

@reedy https://github.com/reedy any way to tag a release so this can be used in stable composer installation?

Thanks.

Sorry for the slow reply... I've created https://github.com/wikimedia/composer-merge-plugin/tree/v2 to revert out the dropping of old PHP support (but no CI due to supported images by GH Actions) and testing of 8.2 (because of different library requirements) to remove the more breaking changes in master... Ideally the next major release wants even more breaking changes (ie dropping composer 1.x support (ala #243 https://github.com/wikimedia/composer-merge-plugin/issues/243).. But those code updates haven't been done yet.

And then turned that into https://github.com/wikimedia/composer-merge-plugin/releases/tag/v2.1.0

— Reply to this email directly, view it on GitHub https://github.com/wikimedia/composer-merge-plugin/pull/233#issuecomment-1509932100, or unsubscribe https://github.com/notifications/unsubscribe-auth/AAPLTPRNE2JRNMYSQZFIKPTXBLXJHANCNFSM5Z4NRVSQ . You are receiving this because you authored the thread.Message ID: @.***>

-- Marc

reedy commented 1 year ago

We don't need a release for it to work... They're primarily for binary releases etc - https://docs.github.com/en/repositories/releasing-projects-on-github/about-releases

https://packagist.org/packages/wikimedia/composer-merge-plugin#v2.1.0 shows it's there, so it can be installed just fine.