Improved display of messages indicating singular numbers

Author: andrey-helldar

app/Services/GitHub.php

@@ -31,7 +31,8 @@ public function __construct(
         protected Factory $output,
         protected Client $github,
         protected ResultPager $paginator,
-    ) {}
+    ) {
+    }
 
     public function repositories(array $repositories): self
     {
@@ -75,16 +76,15 @@ public function markAll(): void
 
     public function mark(): void
     {
-        if (! $items = $this->paginated()) {
+        if (!$items = $this->paginated()) {
             Output::success('No unread notifications');
 
             return;
         }
 
         $count = count($items);
 
-        Output::info('unread notifications detected', $count);
-
+        $this->detected($count);
         $this->process($items);
         $this->result($count);
     }
@@ -122,9 +122,9 @@ protected function notifications(): Notification
     protected function requestByType(NotificationData $notification): ?array
     {
         return match ($notification->type) {
-            'Issue'       => $this->issue($notification),
+            'Issue' => $this->issue($notification),
             'PullRequest' => $this->pullRequest($notification),
-            default       => null
+            default => null
         };
     }
 
@@ -148,7 +148,7 @@ protected function pullRequest(NotificationData $notification): array
 
     protected function shouldSkip(NotificationData $notification, ItemData $item): bool
     {
-        if ($this->repositories && ! Str::startsWith($notification->fullName, $this->repositories)) {
+        if ($this->repositories && !Str::startsWith($notification->fullName, $this->repositories)) {
             return true;
         }
 
@@ -173,12 +173,22 @@ protected function shouldSkip(NotificationData $notification, ItemData $item): b
 
     protected function result(int $count): void
     {
+        $pluralized = $this->marked === 1 ? 'notification' : 'notifications';
+
         $info = sprintf(
-            '%d notifications were marked as read and %d were skipped.',
+            '%d %s were marked as read and %d were skipped.',
             $this->marked,
+            $pluralized,
             $count - $this->marked
         );
 
         $this->marked ? Output::success($info) : Output::info($info);
     }
+
+    protected function detected(int $count): void
+    {
+        $pluralized = $this->marked === 1 ? 'notification' : 'notifications';
+
+        Output::info("unread $pluralized detected", $count);
+    }
 }