Relax Settings::setMergePolicy value to allow int
#2085
Merged
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
franmomu
changed the title
Setting::setMergePolicy value to allow intSettings::setMergePolicy value to allow int
franmomu
force-pushed
the
set_merge_policy
branch
2 times, most recently
from
19997c2
to
c3bf13f
Compare
ruflin
reviewed
Jun 23, 2022
CHANGELOG.md
Outdated
| @@ -6,6 6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 | |||
|
|
|||
| ## [Unreleased](https://github.com/ruflin/Elastica/compare/7.1.5...master) | |||
| ### Backward Compatibility Breaks | |||
| * Changed `Settings::setMergePolicy` signature to allow to pass `int` and `string` as argument 2, if you are overriding this method you must update the signature removing the `string` type-hint. | |||
There was a problem hiding this comment.
Just resolved the merge conflict but now looking at it again, I see the links to PR's are missing. Can you add it by chance?
There was a problem hiding this comment.
sure, I've also added some other I missed
franmomu
force-pushed
the
set_merge_policy
branch
from
6eb2d19
to
66e041f
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Ref: #2082 (comment)
Setting::setMergePolicy()second parameter:Elastica/src/Index/Settings.php
Lines 262 to 266 in ff1a6e0
It expects a
string, but intests:Elastica/tests/Index/SettingsTest.php
Lines 239 to 243 in 4321f37
and looking at https://github.com/elastic/elasticsearch/blob/56d89577a033c15b518e2d74e55d9605eb90b78a/server/src/main/java/org/elasticsearch/index/MergePolicyConfig.java
seems like it could accept at least
intas well based on the examples: https://github.com/elastic/elasticsearch/blob/56d89577a033c15b518e2d74e55d9605eb90b78a/server/src/main/java/org/elasticsearch/index/MergePolicyConfig.java#L39-L80