fa/breadcrumb-the-shire
1
0
Fork 1
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

refactor(support): complete toIntIds() rollout in tenant-area code

Browse Source 
Final pass over tenant repositories and TenantScopeService, collapsing
the remaining two-line intval+filter and one-line intval+unique patterns
onto the shared `toIntIds()` helper. The inline pattern is now gone
from the codebase.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Felix Schneider
2026-04-24 19:43:45 +02:00
parent 1c779b8eeb
commit dbeac6b095
7 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/Repository/CustomField/TenantCustomFieldDefinitionRepository.php
View File

@@ -48,8 +48,7 @@ class TenantCustomFieldDefinitionRepository implements TenantCustomFieldDefiniti
public function listByTenantIds(array $tenantIds, bool $onlyActive = true): array
{
$tenantIds = array_values(array_unique(array_map('intval', $tenantIds)));
$tenantIds = array_values(array_filter($tenantIds, static fn ($id) => $id > 0));
$tenantIds = toIntIds($tenantIds);
if (!$tenantIds) {
return [];
}
@@ -65,8 +64,7 @@ class TenantCustomFieldDefinitionRepository implements TenantCustomFieldDefiniti
public function listFilterableByTenantIds(array $tenantIds): array
{
$tenantIds = array_values(array_unique(array_map('intval', $tenantIds)));
$tenantIds = array_values(array_filter($tenantIds, static fn ($id) => $id > 0));
$tenantIds = toIntIds($tenantIds);
if (!$tenantIds) {
return [];
}

3
core/Repository/CustomField/TenantCustomFieldOptionRepository.php
View File

@@ -24,8 +24,7 @@ class TenantCustomFieldOptionRepository implements TenantCustomFieldOptionReposi
public function listByDefinitionIds(array $definitionIds, bool $onlyActive = true): array
{
$definitionIds = array_values(array_unique(array_map('intval', $definitionIds)));
$definitionIds = array_values(array_filter($definitionIds, static fn ($id) => $id > 0));
$definitionIds = toIntIds($definitionIds);
if (!$definitionIds) {
return [];
}

3
core/Repository/Tenant/TenantLdapAuthRepository.php
View File

@@ -31,8 +31,7 @@ class TenantLdapAuthRepository implements TenantLdapAuthRepositoryInterface
public function listByTenantIds(array $tenantIds): array
{
$tenantIds = array_values(array_unique(array_map('intval', $tenantIds)));
$tenantIds = array_values(array_filter($tenantIds, static fn ($id) => $id > 0));
$tenantIds = toIntIds($tenantIds);
if (!$tenantIds) {
return [];
}

3
core/Repository/Tenant/TenantMicrosoftAuthRepository.php
View File

@@ -29,8 +29,7 @@ class TenantMicrosoftAuthRepository implements TenantMicrosoftAuthRepositoryInte
public function listByTenantIds(array $tenantIds): array
{
$tenantIds = array_values(array_unique(array_map('intval', $tenantIds)));
$tenantIds = array_values(array_filter($tenantIds, static fn ($id) => $id > 0));
$tenantIds = toIntIds($tenantIds);
if (!$tenantIds) {
return [];
}

3
core/Repository/Tenant/TenantRepository.php
View File

@@ -82,8 +82,7 @@ class TenantRepository implements TenantRepositoryInterface
}
if (array_key_exists('tenantIds', $options)) {
$tenantIds = $options['tenantIds'];
$tenantIds = is_array($tenantIds) ? array_values(array_unique(array_map('intval', $tenantIds))) : [];
$tenantIds = array_values(array_filter($tenantIds, static fn ($id) => $id > 0));
$tenantIds = is_array($tenantIds) ? toIntIds($tenantIds) : [];
if ($tenantIds) {
$where[] = 'tenants.id in (???)';
$params[] = $tenantIds;

3
core/Repository/Tenant/UserTenantRepository.php
View File

@@ -53,8 +53,7 @@ class UserTenantRepository implements UserTenantRepositoryInterface
private function countByTenantIds(array $tenantIds, bool $activeOnly): array
{
$tenantIds = array_values(array_unique(array_map('intval', $tenantIds)));
$tenantIds = array_values(array_filter($tenantIds, static fn ($id) => $id > 0));
$tenantIds = toIntIds($tenantIds);
if (!$tenantIds) {
return [];
}

10
core/Service/Tenant/TenantScopeService.php
View File

@@ -90,7 +90,7 @@ class TenantScopeService
public function filterTenantIdsForUser(array $tenantIds, int $userId): array
{
$tenantIds = array_values(array_unique(array_map('intval', $tenantIds)));
$tenantIds = toIntIds($tenantIds);
$userTenantIds = $this->getUserTenantIds($userId);
if (!$userTenantIds) {
return [];
@@ -104,9 +104,9 @@ class TenantScopeService
array $existingTenantIds,
array $allowedTenantIds
): array {
$requestedTenantIds = array_values(array_unique(array_map('intval', $requestedTenantIds)));
$existingTenantIds = array_values(array_unique(array_map('intval', $existingTenantIds)));
$allowedTenantIds = array_values(array_unique(array_map('intval', $allowedTenantIds)));
$requestedTenantIds = toIntIds($requestedTenantIds);
$existingTenantIds = toIntIds($existingTenantIds);
$allowedTenantIds = toIntIds($allowedTenantIds);
if (!$allowedTenantIds) {
return $existingTenantIds;
@@ -165,7 +165,7 @@ class TenantScopeService
private function filterActiveTenantIds(array $tenantIds): array
{
$tenantIds = array_values(array_unique(array_map('intval', $tenantIds)));
$tenantIds = toIntIds($tenantIds);
if (!$tenantIds) {
return [];
}