This repository has been archived by the owner on Jan 21, 2020. It is now read-only.
Hotfix #21 - patchKey merge configuration instead of override #25
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
Configuration is always read from the file, but in the test configuration was not stored in the file. Expected result was then not full, because it should contain current config with merged changes from patch.
weierophinney
added a commit
that referenced
this pull request
Nov 1, 2017
Hotfix #21 - patchKey merge configuration instead of override
weierophinney
added a commit
that referenced
this pull request
Nov 1, 2017
- Also removes empty stub for 1.2.2.
weierophinney
added a commit
that referenced
this pull request
Nov 1, 2017
Forward port #25 Conflicts: CHANGELOG.md
|
Thanks, @webimpress! |
|
@webimpress there is issue #28 after update with this, could you take a look? Thank you. |
|
@samsonasik sure, I'll have a look on it |
weierophinney
added a commit
to weierophinney/zf-configuration
that referenced
this pull request
Nov 14, 2017
This reverts commit 8e14178, reversing changes made to 09f5af9. Fixes zfcampus#28
TomHAnderson
added a commit
to TomHAnderson/zf-configuration
that referenced
this pull request
Mar 19, 2018
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Method
patchKeywas not tested at all. It should merge configuration instead of override.To override configuration method
replaceKeyshould be used instead.Fixes #21
/cc @TomHAnderson @kusmierz