Skip to content

Fix incorrect subdomain identification #1423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kostamilorava wants to merge 3 commits into from
Closed

Fix incorrect subdomain identification #1423

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59d2c6d
fix incorrect subdomain identification
kostamilorava Dec 11, 2025
d77d98f
revert function type to public static
kostamilorava Dec 11, 2025
b33869f
fix failing tests
kostamilorava Dec 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions src/Resolvers/DomainTenantResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,22 @@
return $tenant;
}

public static function isSubdomain(string $domain): bool
protected function isSubdomain(string $hostname): bool
{
return Str::endsWith($domain, config('tenancy.identification.central_domains'));
$centralDomains = Arr::wrap(config('tenancy.central_domains'));

Check failure on line 61 in src/Resolvers/DomainTenantResolver.php

View workflow job for this annotation

GitHub Actions / Static analysis (PHPStan) 

Call to static method wrap() on an unknown class Stancl\Tenancy\Resolvers\Arr.

foreach ($centralDomains as $domain) {

if ($hostname === $domain) {
return false;
}

if (Str::endsWith($hostname, '.' . $domain)) {
return true;
}
}

return false;
}

public function resolved(Tenant $tenant, mixed ...$args): void
Expand Down
Loading