Skip to content

Commit

Permalink
Merge pull request mongodb#1 from jenssegers/master
Browse files Browse the repository at this point in the history
Pull from original repo
  • Loading branch information
mnphpexpert committed Jan 22, 2020
2 parents f4ab9fb + 5c03c7b commit 05c995d
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/build-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -60,3 +61,4 @@ jobs:
run: vendor/bin/php-coveralls -v
env:
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
continue-on-error: true
1 change: 1 addition & 0 deletions .styleci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
preset: laravel
6 changes: 4 additions & 2 deletions src/Jenssegers/Mongodb/Eloquent/HybridRelations.php
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ public function morphTo($name = null, $type = null, $id = null, $ownerKey = null
// 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
);
}

Expand All @@ -195,8 +195,10 @@ public function morphTo($name = null, $type = null, $id = null, $ownerKey = null

$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
);
}

Expand Down

0 comments on commit 05c995d

Please sign in to comment.