fix for returning incorrect builder in hybrid relations #1326
Conversation
|
@jenssegers Sorry for the failed test, I have fixed the CI and now it passes. I would be obliged if you could merge this :) |
| use Illuminate\Auth\Authenticatable; | ||
| use Illuminate\Auth\Passwords\CanResetPassword; | ||
| use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract; | ||
| use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract; | ||
|
|
||
| class User extends Eloquent implements AuthenticatableContract, CanResetPasswordContract | ||
| { | ||
| use Authenticatable, CanResetPassword; |
There was a problem hiding this comment.
This should not be needed right? Since Eloquent had this trait as well?
There was a problem hiding this comment.
Not sure what you mean, but I added the HybridRelations trait for the User model as using that trait immediately gives an error without this fix. In the first commit I used 2 use statements which I replaced to be 1 statement, therefor this line shows as deleted.
I dont think the Eloquent model class (either mongodb's or laravel's) implements one of these traits already
There was a problem hiding this comment.
Jenssegers\Mongodb\Eloquent\Model already has the HybridRelations trait, which the model extends from.
There was a problem hiding this comment.
Ah ok. Thanks for merging.
fix for returning incorrect builder in hybrid relations
@jenssegers @Tucker-Eric
Commit 266305c introduced a bug when using HybridRelations in combination with e.g. raw methods. The
newEloquentBuildermethod always returned aIlluminate\Database\Eloquent\Builderbut forJenssegers\Mongodb\Eloquent\Modelmodels it should return aJenssegers\Mongodb\Eloquent\Builder.