archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2025-12-12 17:24:03 +00:00
Code Activity

phpstan, global_cache, resolver improvements, InitializationHelpers trait

Browse source
This commit is contained in:
Samuel Štancl 2022-09-29 02:47:13 +02:00
parent fd65cf1754
commit 87212e5390
35 changed files with 170 additions and 231 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Resolvers/Contracts/CachedTenantResolver.php
View file

@ -65,7 +65,7 @@ abstract class CachedTenantResolver implements TenantResolver
abstract public function resolveWithoutCache(mixed ...$args): Tenant;
public function resolved(Tenant $tenant, ...$args): void
public function resolved(Tenant $tenant, mixed ...$args): void
{
}

3
src/Resolvers/DomainTenantResolver.php
View file

@ -24,7 +24,6 @@ class DomainTenantResolver extends Contracts\CachedTenantResolver
{
$domain = $args[0];
/** @var Tenant|null $tenant */
$tenant = config('tenancy.tenant_model')::query()
->whereHas('domains', fn (Builder $query) => $query->where('domain', $domain))
->with('domains')
@ -39,7 +38,7 @@ class DomainTenantResolver extends Contracts\CachedTenantResolver
throw new TenantCouldNotBeIdentifiedOnDomainException($args[0]);
}
public function resolved(Tenant $tenant, ...$args): void
public function resolved(Tenant $tenant, mixed ...$args): void
{
$this->setCurrentDomain($tenant, $args[0]);
}

4
src/Resolvers/PathTenantResolver.php
View file

@ -23,7 +23,7 @@ class PathTenantResolver extends Contracts\CachedTenantResolver
/** @var Route $route */
$route = $args[0];
if ($id = $route->parameter(static::$tenantParameterName)) {
if ($id = (string) $route->parameter(static::$tenantParameterName)) {
$route->forgetParameter(static::$tenantParameterName);
if ($tenant = tenancy()->find($id)) {
@ -37,7 +37,7 @@ class PathTenantResolver extends Contracts\CachedTenantResolver
public function getArgsForTenant(Tenant $tenant): array
{
return [
[$tenant->id],
[$tenant->getTenantKey()],
];
}
}

4
src/Resolvers/RequestDataTenantResolver.php
View file

@ -17,7 +17,7 @@ class RequestDataTenantResolver extends Contracts\CachedTenantResolver
public function resolveWithoutCache(mixed ...$args): Tenant
{
$payload = $args[0];
$payload = (string) $args[0];
if ($payload && $tenant = tenancy()->find($payload)) {
return $tenant;
@ -29,7 +29,7 @@ class RequestDataTenantResolver extends Contracts\CachedTenantResolver
public function getArgsForTenant(Tenant $tenant): array
{
return [
[$tenant->id],
[$tenant->getTenantKey()],
];
}
}