From ae392d55e8d96dc1e7ab82ee320e9288f7afbaa4 Mon Sep 17 00:00:00 2001 From: fs Date: Sun, 22 Mar 2026 14:15:29 +0100 Subject: [PATCH] refactor: remove redundant null-coalescing and type checks in UserAccountService Values are already guaranteed by the repository layer, so defensive guards like ?? 0, ?? '' and is_array() are unnecessary. Co-Authored-By: Claude Opus 4.6 (1M context) --- lib/Service/User/UserAccountService.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/Service/User/UserAccountService.php b/lib/Service/User/UserAccountService.php index e6ece9c..e335818 100644 --- a/lib/Service/User/UserAccountService.php +++ b/lib/Service/User/UserAccountService.php @@ -192,11 +192,11 @@ class UserAccountService foreach ($deletedUsers as $deletedUser) { $this->eventDispatcher?->dispatch('user.deleted', [ - 'user_id' => (int) ($deletedUser['id'] ?? 0), - 'uuid' => (string) ($deletedUser['uuid'] ?? ''), + 'user_id' => (int) $deletedUser['id'], + 'uuid' => (string) $deletedUser['uuid'], 'actor_user_id' => $currentUserId, - 'display_name' => (string) ($deletedUser['display_name'] ?? ''), - 'tenant_ids' => is_array($deletedUser['tenant_ids'] ?? null) ? $deletedUser['tenant_ids'] : [], + 'display_name' => (string) $deletedUser['display_name'], + 'tenant_ids' => $deletedUser['tenant_ids'], ]); } @@ -579,7 +579,7 @@ class UserAccountService continue; } - $targetUserId = (int) ($user['id'] ?? 0); + $targetUserId = (int) $user['id']; if ($targetUserId <= 0) { continue; } @@ -843,7 +843,7 @@ class UserAccountService private function safeAssignmentsForUser(int $userId): array { $assignments = $this->userAssignmentService->buildAssignmentsForUser($userId); - return is_array($assignments) ? $assignments : []; + return $assignments; } private function extractAssignmentIds(array $assignments, string $key): array