Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
L
laravel-mongodb
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sinan
laravel-mongodb
Commits
692461e5
Commit
692461e5
authored
Jan 21, 2020
by
Smolevich
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of github.com:jenssegers/laravel-mongodb into add-matrix-mongodb
parents
f3021c2b
69e4da5d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
.styleci.yml
.styleci.yml
+1
-0
HybridRelations.php
src/Jenssegers/Mongodb/Eloquent/HybridRelations.php
+4
-2
No files found.
.styleci.yml
0 → 100644
View file @
692461e5
preset
:
laravel
src/Jenssegers/Mongodb/Eloquent/HybridRelations.php
View file @
692461e5
...
@@ -184,7 +184,7 @@ trait HybridRelations
...
@@ -184,7 +184,7 @@ trait HybridRelations
// there are multiple types in the morph and we can't use single queries.
// there are multiple types in the morph and we can't use single queries.
if
((
$class
=
$this
->
$type
)
===
null
)
{
if
((
$class
=
$this
->
$type
)
===
null
)
{
return
new
MorphTo
(
return
new
MorphTo
(
$this
->
newQuery
(),
$this
,
$id
,
null
,
$type
,
$name
$this
->
newQuery
(),
$this
,
$id
,
$ownerKey
,
$type
,
$name
);
);
}
}
...
@@ -195,8 +195,10 @@ trait HybridRelations
...
@@ -195,8 +195,10 @@ trait HybridRelations
$instance
=
new
$class
;
$instance
=
new
$class
;
$ownerKey
=
$ownerKey
??
$instance
->
getKeyName
();
return
new
MorphTo
(
return
new
MorphTo
(
$instance
->
newQuery
(),
$this
,
$id
,
$
instance
->
getKeyName
()
,
$type
,
$name
$instance
->
newQuery
(),
$this
,
$id
,
$
ownerKey
,
$type
,
$name
);
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment