This repository has been archived by the owner on Jan 21, 2020. It is now read-only.
Merge configuration keys #101
Closed
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
…lled with options from the service manager.
…hout any configuration given.
weierophinney
added a commit
that referenced
this pull request
May 7, 2018
|
Thanks, @func0der; merged to develop for release with 1.4.0. |
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.
Fix for #99
I can create a single commit, if that is preferred, but I thought for reviewing this is easier.
I added functionality to ContentNegotiationOptions that merges the - i call them legacy - config keys into one big one, so that different modules do not overwrite each other anymore.
Also I found a bug in the ContentNegotiationOptionsFactoryTest. The service key
confighas to be written in lower case, at least for your factory setup. I corrected that and recognized, that the test was not covering the whole factory. So I added two more test cases that should cover the whole factory class and its paths.