[5.7] Fix wrong class being used when eager loading nullable MorphTo with withDefault() #27411
Conversation
MorphTo::withDefault() now always creates a fresh model instance, so we can't know the exact output in advance for use in assertSame(). Instead, use assertEquals() to check that two instances of a model have the same attributes.
|
FYI: we reverted this because this conflicted on master. You're free to re-send this to master if you like with passing tests. |
|
The conflict on master is due to the change in 4fd8a16 - renaming I could resubmit this PR to 5.7 using the method |
|
@bucaneer I tried to fix it by using the proper name but I was still getting failing tests so I believe the problem lies deeper. I believe this is best solved with a PR to 5.8 as we want to avoid breaking things too much now that we're close to the new release. |
Fixes #27369
Currently, MorphTo inherits the
newRelatedInstanceFor()method from BelongsTo, which ignores the passed$parentargument and instantiates a related model based on the generalized relationship instance (without constraints) produced by the query builder . However, in the case of MorphTo relations, the no-constraint relationship instance does not know anything about related classes, and wrongly defaults to the parent model class. This commit simply makes use of the$parentargument to produce a related instance that is appropriate for the parent model instance.This is a resubmit of PR #27382 with updated tests. Pre-existing tests of MorphTo
withDefault()had to be modified because they relied on the old behavior ofnewRelatedInstanceFor()where it would always return the same predefined instance of the related model. Additionally, a new test was added to ensure that issue #27369 is really fixed.