Fixed unsetting from loosely equal keys OrderedHashMap #24566
Merged
Conversation
This file contains hidden or 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
Contributor
maryo
commented
Oct 15, 2017
| Q | A |
|---|---|
| Branch? | 2.7 |
| Bug fix? | yes |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | no |
| Tests pass? | yes |
| Fixed tickets | #24558 |
| License | MIT |
nicolas-grekas
approved these changes
Oct 16, 2017
fabpot
approved these changes
Oct 16, 2017
|
Thank you @maryo. |
fabpot
added a commit
that referenced
this pull request
Oct 16, 2017
…ryo) This PR was merged into the 2.7 branch. Discussion ---------- Fixed unsetting from loosely equal keys OrderedHashMap | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #24558 | License | MIT Commits ------- ba37cba Fixed unsetting from loosely equal keys OrderedHashMap
xabbuh
reviewed
Oct 17, 2017
| @@ -144,7 +144,7 @@ public function offsetSet($key, $value) | |||
| */ | |||
| public function offsetUnset($key) | |||
| { | |||
| if (false !== ($position = array_search($key, $this->orderedKeys))) { | |||
| if (false !== ($position = array_search((string) $key, $this->orderedKeys))) { | |||
There was a problem hiding this comment.
Wouldn't it have been enough to pass true as the third argument here?
There was a problem hiding this comment.
@xabbuh https://3v4l.org/vBboa
When unsetting a numeric string offset like unset($map['1']), $key equals to integer 1. So it's needed to treat these numeric strings the same way as integers. Hence the cast. And since $this->orderedKeys are all strings (the new cast in offsetSet), passing true would result in the same.
This was referenced Oct 30, 2017
Merged
Merged
This was referenced Nov 10, 2017
Merged
Merged
Merged
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.