From f92b682eb338f0e3b4126ddc9c398548f4c6ee3a Mon Sep 17 00:00:00 2001 From: lukinovec Date: Fri, 22 Jul 2022 15:10:00 +0200 Subject: [PATCH] Update tenants option trait --- .../{HasATenantsOption.php => HasTenantOptions.php} | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) rename src/Concerns/{HasATenantsOption.php => HasTenantOptions.php} (77%) diff --git a/src/Concerns/HasATenantsOption.php b/src/Concerns/HasTenantOptions.php similarity index 77% rename from src/Concerns/HasATenantsOption.php rename to src/Concerns/HasTenantOptions.php index d3fea6e0..1878df75 100644 --- a/src/Concerns/HasATenantsOption.php +++ b/src/Concerns/HasTenantOptions.php @@ -7,7 +7,10 @@ namespace Stancl\Tenancy\Concerns; use Illuminate\Support\LazyCollection; use Symfony\Component\Console\Input\InputOption; -trait HasATenantsOption +/** + * Adds 'tenants' and 'with-pending' options. + */ +trait HasTenantOptions { protected function getOptions() { @@ -24,14 +27,12 @@ trait HasATenantsOption ->when($this->option('tenants'), function ($query) { $query->whereIn(tenancy()->model()->getTenantKeyName(), $this->option('tenants')); }) + ->when(tenancy()->model()::hasGlobalScope(PendingScope::class), function($query) { + $query->withPending($this->option('with-pending')); + }) ->cursor(); } - protected function withPending(): ?bool - { - return $this->option('with-pending') ? true : null; - } - public function __construct() { parent::__construct();