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
5fcac253
Unverified
Commit
5fcac253
authored
Jan 22, 2020
by
rennokki
Committed by
GitHub
Jan 22, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into refactor/readme
parents
d9f9fc74
3e5e9de2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
4 deletions
+8
-4
build-ci.yml
.github/workflows/build-ci.yml
+4
-2
HybridRelations.php
src/Jenssegers/Mongodb/Eloquent/HybridRelations.php
+4
-2
No files found.
.github/workflows/build-ci.yml
View file @
5fcac253
...
...
@@ -13,9 +13,10 @@ jobs:
matrix
:
php
:
[
7.1
,
7.2
,
7.3
,
7.4
]
os
:
[
'
ubuntu-latest'
]
mongodb
:
[
3.6
,
4.0
,
4.2
]
services
:
mongo
:
image
:
mongo
image
:
mongo
:${{ matrix.mongodb }}
ports
:
-
27017:27017
mysql
:
...
...
@@ -26,7 +27,7 @@ jobs:
MYSQL_ALLOW_EMPTY_PASSWORD
:
'
yes'
MYSQL_DATABASE
:
'
unittest'
MYSQL_ROOT_PASSWORD
:
name
:
PHP ${{ matrix.php }}
Test ${{ matrix.env
}}
name
:
PHP ${{ matrix.php }}
with mongo ${{ matrix.mongodb
}}
steps
:
-
uses
:
actions/checkout@v1
...
...
@@ -60,3 +61,4 @@ jobs:
run
:
vendor/bin/php-coveralls -v
env
:
COVERALLS_REPO_TOKEN
:
${{ secrets.GITHUB_TOKEN }}
continue-on-error
:
true
src/Jenssegers/Mongodb/Eloquent/HybridRelations.php
View file @
5fcac253
...
...
@@ -184,7 +184,7 @@ trait HybridRelations
// there are multiple types in the morph and we can't use single queries.
if
((
$class
=
$this
->
$type
)
===
null
)
{
return
new
MorphTo
(
$this
->
newQuery
(),
$this
,
$id
,
null
,
$type
,
$name
$this
->
newQuery
(),
$this
,
$id
,
$ownerKey
,
$type
,
$name
);
}
...
...
@@ -195,8 +195,10 @@ trait HybridRelations
$instance
=
new
$class
;
$ownerKey
=
$ownerKey
??
$instance
->
getKeyName
();
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