archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2026-02-06 08:24:03 +00:00
Code Activity

clean up code

Browse source
This commit is contained in:
Samuel Štancl 2021-04-13 23:00:26 +02:00 • committed by GitHub
parent 2aec8417e9
commit c436b06cba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/Resolvers/DomainTenantResolver.php
View file

@ -7,6 +7,7 @@ namespace Stancl\Tenancy\Resolvers;
use Stancl\Tenancy\Contracts\Domain; use Stancl\Tenancy\Contracts\Domain;
use Stancl\Tenancy\Contracts\Tenant; use Stancl\Tenancy\Contracts\Tenant;
use Stancl\Tenancy\Exceptions\TenantCouldNotBeIdentifiedOnDomainException; use Stancl\Tenancy\Exceptions\TenantCouldNotBeIdentifiedOnDomainException;
use Illuminate\Database\Eloquent\Builder;
class DomainTenantResolver extends Contracts\CachedTenantResolver class DomainTenantResolver extends Contracts\CachedTenantResolver
{ {
@ -32,14 +33,14 @@ class DomainTenantResolver extends Contracts\CachedTenantResolver
/** @var Tenant|null $tenant */ /** @var Tenant|null $tenant */
$tenant = config('tenancy.tenant_model')::query() $tenant = config('tenancy.tenant_model')::query()
->whereHas('domains', function ($query) use ($domain) { ->whereHas('domains', function (Builder $query) use ($domain) {
$query->where('domain', $domain); $query->where('domain', $domain);
}) })
->with('domains') ->with('domains')
->first(); ->first();
if ($tenant) { if ($tenant) {
$this->setCurrentDomain($tenant, ...$args); $this->setCurrentDomain($tenant, $domain);
return $tenant; return $tenant;
} }
@ -47,14 +48,14 @@ class DomainTenantResolver extends Contracts\CachedTenantResolver
throw new TenantCouldNotBeIdentifiedOnDomainException($args[0]); throw new TenantCouldNotBeIdentifiedOnDomainException($args[0]);
} }
public function tenantIdentified(Tenant $tenant, ...$args): void public function resolved(Tenant $tenant, ...$args): void
{ {
$this->setCurrentDomain($tenant, ...$args); $this->setCurrentDomain($tenant, $args[0]);
} }
protected function setCurrentDomain(Tenant $tenant, ...$args): void protected function setCurrentDomain(Tenant $tenant, string $domain): void
{ {
static::$currentDomain = $tenant->domains->where('domain', $args[0])->first(); static::$currentDomain = $tenant->domains->where('domain', $domain)->first();
} }
public function getArgsForTenant(Tenant $tenant): array public function getArgsForTenant(Tenant $tenant): array