From 837441d34e12920354075b3efbf33991a4dd810b Mon Sep 17 00:00:00 2001 From: Roardom Date: Tue, 30 Apr 2024 09:15:37 +0000 Subject: [PATCH] refactor: simplify chatroom get echoes/audibles exist condition --- app/Http/Controllers/API/ChatController.php | 4 ++-- phpstan-baseline.neon | 10 ---------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/app/Http/Controllers/API/ChatController.php b/app/Http/Controllers/API/ChatController.php index 98fa06355..293bf3198 100644 --- a/app/Http/Controllers/API/ChatController.php +++ b/app/Http/Controllers/API/ChatController.php @@ -54,7 +54,7 @@ class ChatController extends Controller { $user = $request->user()->load(['echoes']); - if (!$user->echoes || (is_countable($user->echoes->toArray()) ? \count($user->echoes->toArray()) : 0) < 1) { + if ($user->echoes->isEmpty()) { $userEcho = new UserEcho(); $userEcho->user_id = $request->user()->id; $userEcho->room_id = 1; @@ -69,7 +69,7 @@ class ChatController extends Controller { $user = $request->user()->load(['audibles']); - if (!$user->audibles || (is_countable($user->audibles->toArray()) ? \count($user->audibles->toArray()) : 0) < 1) { + if ($user->audibles->isEmpty()) { $userAudible = new UserAudible(); $userAudible->user_id = $request->user()->id; $userAudible->room_id = 1; diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 5672fc1a0..33e4d833a 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -525,11 +525,6 @@ parameters: count: 6 path: app/Http/Controllers/API/ChatController.php - - - message: "#^Else branch is unreachable because ternary operator condition is always true\\.$#" - count: 2 - path: app/Http/Controllers/API/ChatController.php - - message: "#^Method App\\\\Http\\\\Controllers\\\\API\\\\ChatController\\:\\:botMessages\\(\\) has parameter \\$botId with no type specified\\.$#" count: 1 @@ -555,11 +550,6 @@ parameters: count: 1 path: app/Http/Controllers/API/ChatController.php - - - message: "#^Negated boolean expression is always false\\.$#" - count: 2 - path: app/Http/Controllers/API/ChatController.php - - message: "#^Property App\\\\Models\\\\UserAudible\\:\\:\\$status \\(int\\) does not accept bool\\.$#" count: 3