Properly handle underscores in update option names #1621
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
nomoa
force-pushed
the
fix-underscore-prefix-in-bulk
branch
2 times, most recently
from
7a64fcb
to
3fabc15
Compare
ruflin
reviewed
Mar 28, 2019
nomoa
force-pushed
the
fix-underscore-prefix-in-bulk
branch
from
3fabc15
to
28b9555
Compare
Since 6.1.0 all metadata except _index, _type and _id are accepted without the underscore. In 6.5 it produces a deprecation warning and in 7 they are no longer accepted.
nomoa
force-pushed
the
fix-underscore-prefix-in-bulk
branch
from
28b9555
to
e9551bd
Compare
nomoa
changed the title
ruflin
approved these changes
Mar 29, 2019
There was a problem hiding this comment.
LGTM. I also feel pretty confortable to make this breaking change as we have now a 6.x branch: https://github.com/ruflin/Elastica/tree/6.x
Your initial PR would probably fit well there I'm thinking now.
| $data[\ltrim($key, '_')] = $value; | ||
| unset($data[$key]); | ||
| } | ||
| return \array_filter(\array_intersect_key($this->getParams(), \array_flip($fields))); |
|
Thanks for the merge, as for the initial patch I think it was still breaking 6.0 for users of retry_on_conflict with bulk updates. |
|
@nomoa I'm pretty sure it will pop up again, but lets wait until it does ;-) |
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.
Since 6.1.0 all metadata except _index, _type and _id are accepted without the
underscore. In 6.5 it produces a deprecation warning and in 7 they are no
longer accepted.