From f4898bec2bb8afe13fcd37ecdcba8fdc216f2545 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20=C5=A0tancl?= Date: Thu, 14 May 2020 04:20:06 +0200 Subject: [PATCH] Rename parent model -> getRelationshipToPrimaryModel --- src/Database/Concerns/BelongsToPrimaryModel.php | 2 +- src/Database/ParentModelScope.php | 2 +- tests/SingleDatabaseTenancyTest.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Database/Concerns/BelongsToPrimaryModel.php b/src/Database/Concerns/BelongsToPrimaryModel.php index 3d871beb..45e1ae3e 100644 --- a/src/Database/Concerns/BelongsToPrimaryModel.php +++ b/src/Database/Concerns/BelongsToPrimaryModel.php @@ -6,7 +6,7 @@ use Stancl\Tenancy\Database\ParentModelScope; trait BelongsToPrimaryModel { - abstract public function getParentRelationshipName(): string; + abstract public function getRelationshipToPrimaryModel(): string; public static function bootBelongsToPrimaryModel() { diff --git a/src/Database/ParentModelScope.php b/src/Database/ParentModelScope.php index 684c2dd4..46b21f20 100644 --- a/src/Database/ParentModelScope.php +++ b/src/Database/ParentModelScope.php @@ -14,7 +14,7 @@ class ParentModelScope implements Scope return; } - $builder->whereHas($builder->getModel()->getParentRelationshipName()); + $builder->whereHas($builder->getModel()->getRelationshipToPrimaryModel()); } public function extend(Builder $builder) diff --git a/tests/SingleDatabaseTenancyTest.php b/tests/SingleDatabaseTenancyTest.php index 7180ee28..f456f049 100644 --- a/tests/SingleDatabaseTenancyTest.php +++ b/tests/SingleDatabaseTenancyTest.php @@ -310,7 +310,7 @@ class ScopedComment extends Comment protected $table = 'comments'; - public function getParentRelationshipName(): string + public function getRelationshipToPrimaryModel(): string { return 'post'; }