Fix hydration in a joined inheritance with simple array or json array#6004
Closed
cvuorinen wants to merge 5 commits into
Closed
Fix hydration in a joined inheritance with simple array or json array#6004cvuorinen wants to merge 5 commits into
cvuorinen wants to merge 5 commits into
Conversation
Field with type=simple_array in a joined inheritance gets overridden by empty array in the hydrator
SimpleArrayType and JsonArrayType convert NULL value to an empty array, which fails the null check that is used to prevent overwrite Fixes issue doctrine#5989
| } | ||
|
|
||
| // Check if value is null before conversion (because some types convert null to something else) | ||
| $valueIsNull = $value === null; |
Contributor
There was a problem hiding this comment.
Please, use Yoda condition instead.
| class Issue5989Employee extends Issue5989Person | ||
| { | ||
| /** | ||
| * @column(type="simple_array", nullable=true) |
Member
There was a problem hiding this comment.
case sensitivity, careful :-) (@Column)
Contributor
Author
There was a problem hiding this comment.
Yea, I think it was copy paste from some existing models you have there. There are quite a few with lowercase. But I'll fix these.
Member
|
Looks good! Feedback is only technical/minor stuff to be fixed, but this is going to be merged once that's fixed :-) |
Member
|
@cvuorinen this looks good! Should I take over for a merge? |
Contributor
Author
|
@Ocramius I found a way to add a unit test that also reproduces this issue and passes with the fix. |
Member
|
@cvuorinen yes, that looks exactly like what I was asking for. |
Contributor
Author
|
OK, then it's ready for merge. |
Member
|
Merged, thanks a lot @cvuorinen! |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Both SimpleArrayType and JsonArrayType convert the value
nullto an empty array, which fails the null check that is used to prevent overwrite (in https://github.com/doctrine/doctrine2/blob/v2.5.4/lib/Doctrine/ORM/Internal/Hydration/SimpleObjectHydrator.php#L134).Fixes issue #5989
It could be debated that the issue is actually with the types that convert null to something else (especially since ArrayType actually returns null when the value is null). But changing them would be a BC break so I think it is a separate issue. Also, there is no way to know how custom types will convert null values, so it seems like a reasonable approach to check for null before the conversion since it's quite a serious bug to overwrite data in the hydrator.