Skip to content
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

Fix merge of string array config options #1067

Merged
merged 2 commits into from
Mar 7, 2017

Conversation

mbrodala
Copy link
Contributor

@mbrodala mbrodala commented Mar 7, 2017

Q A
Bug fix? Yes
New feature? No
BC breaks? No
Deprecations? No
Fixed tickets N/A

This unbreaks e.g. the following:

add('shared_files', ['foo']);
add('shared_files', ['bar']);

Without this fix, this would become ['bar'] instead of ['foo', 'bar'].

mbrodala added 2 commits March 7, 2017 11:51
This unbreaks e.g. the following:

add('shared_files', ['foo']);
add('shared_files', ['bar']);

Without this fix, this would become ['bar'] instead of ['foo', 'bar']
mbrodala referenced this pull request Mar 7, 2017
* Add (failing) tests for scalar option merge behavior

* Fix scalar values on recursive option merge

This covers the following two essential usecases:

1. A scalar default value should be overridden
2. Values should be added to a array default value

* Update changelog

* Add a few comments

* Use specific class name for config merge
@antonmedv
Copy link
Member

antonmedv commented Mar 7, 2017

Thanks a lot. You save me this this PR.

I give you contributor star ⭐️

@antonmedv antonmedv merged commit 4e24104 into deployphp:master Mar 7, 2017
@mbrodala mbrodala deleted the fix-string-array-merge branch March 7, 2017 12:23
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