FIX load fields if lazy ones exists #6604
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
andrewandante
force-pushed
the
FIX/hydrate-lazy-fields-on-dbobject
branch
from
f77a410
to
e862f76
Compare
dhensby
reviewed
Feb 7, 2017
src/ORM/DataObject.php
Outdated
| $tableClass = $this->record[$fieldName . '_Lazy']; | ||
| $this->loadLazyFields($tableClass); | ||
|
|
||
| $value = isset($this->record[$fieldName]) ? $this->record[$fieldName] : null; |
There was a problem hiding this comment.
I think we do need to investigate how a $field . '_Lazy' can still be unset after calling loadLazyFields
There was a problem hiding this comment.
!$value matches false. would suggest using !isset($this->record[$fieldName]) in this if block instead, and moving the value-setter on line 2724 to below this if clause. then line 2732 isn't needed.
sminnee
previously requested changes
Feb 7, 2017
src/ORM/DataObject.php
Outdated
| $tableClass = $this->record[$fieldName . '_Lazy']; | ||
| $this->loadLazyFields($tableClass); | ||
|
|
||
| $value = isset($this->record[$fieldName]) ? $this->record[$fieldName] : null; |
There was a problem hiding this comment.
!$value matches false. would suggest using !isset($this->record[$fieldName]) in this if block instead, and moving the value-setter on line 2724 to below this if clause. then line 2732 isn't needed.
andrewandante
force-pushed
the
FIX/hydrate-lazy-fields-on-dbobject
branch
from
e862f76
to
b8a0944
Compare
|
Reordered as per @sminnee recommendations - failing test is the code coverage one. |
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.
Resolves #6603
Bonus test for good measure.