improve variable naming

Author: danharrin

Diff for: packages/actions/src/Concerns/CanNotify.php

@@ -245,17 +245,21 @@ public function getFailureNotificationBody(): ?string
                 $this->missingBulkAuthorizationFailureNotificationMessage,
                 [
                     'count' => $this->bulkAuthorizationFailureWithoutMessageCount,
+                    'failureCount' => $this->bulkAuthorizationFailureWithoutMessageCount,
                     'isAll' => $this->bulkAuthorizationFailureWithoutMessageCount === $this->totalSelectedRecordsCount,
                     'total' => $this->totalSelectedRecordsCount,
+                    'totalCount' => $this->totalSelectedRecordsCount,
                 ],
             )) ? [$message] : []),
             ...$this->getBulkProcessingFailureMessages(),
             ...($this->bulkProcessingFailureWithoutMessageCount && filled($message = $this->evaluate(
                 $this->missingBulkProcessingFailureNotificationMessage,
                 [
                     'count' => $this->bulkProcessingFailureWithoutMessageCount,
+                    'failureCount' => $this->bulkProcessingFailureWithoutMessageCount,
                     'isAll' => $this->bulkProcessingFailureWithoutMessageCount === $this->totalSelectedRecordsCount,
                     'total' => $this->totalSelectedRecordsCount,
+                    'totalCount' => $this->totalSelectedRecordsCount,
                 ],
             )) ? [$message] : []),
         ];

Diff for: packages/actions/src/Concerns/InteractsWithSelectedRecords.php

@@ -138,8 +138,10 @@ function (array $carry, array $failure): array {
 
                 $carry[] = $this->evaluate($failure['message'], [
                     'count' => $failure['count'],
+                    'failureCount' => $failure['count'],
                     'isAll' => $failure['count'] === $this->totalSelectedRecordsCount,
                     'total' => $this->totalSelectedRecordsCount,
+                    'totalCount' => $this->totalSelectedRecordsCount,
                 ]);
 
                 return $carry;

Diff for: packages/actions/src/DeleteBulkAction.php

@@ -47,23 +47,23 @@ protected function setUp(): void
             ]);
         });
 
-        $this->missingBulkAuthorizationFailureNotificationMessage(function (int $count, bool $isAll): string {
+        $this->missingBulkAuthorizationFailureNotificationMessage(function (int $failureCount, int $totalCount): string {
             return trans_choice(
-                $isAll
+                ($failureCount === $totalCount)
                     ? 'filament-actions::delete.multiple.notifications.deleted_none.missing_authorization_failure_message'
                     : 'filament-actions::delete.multiple.notifications.deleted_partial.missing_authorization_failure_message',
-                $count,
-                ['count' => Number::format($count)],
+                $failureCount,
+                ['count' => Number::format($failureCount)],
             );
         });
 
-        $this->missingBulkProcessingFailureNotificationMessage(function (int $count, bool $isAll): string {
+        $this->missingBulkProcessingFailureNotificationMessage(function (int $failureCount, int $totalCount): string {
             return trans_choice(
-                $isAll
+                ($failureCount === $totalCount)
                     ? 'filament-actions::delete.multiple.notifications.deleted_none.missing_processing_failure_message'
                     : 'filament-actions::delete.multiple.notifications.deleted_partial.missing_processing_failure_message',
-                $count,
-                ['count' => Number::format($count)],
+                $failureCount,
+                ['count' => Number::format($failureCount)],
             );
         });
 

Diff for: packages/actions/src/ForceDeleteBulkAction.php

@@ -47,23 +47,23 @@ protected function setUp(): void
             ]);
         });
 
-        $this->missingBulkAuthorizationFailureNotificationMessage(function (int $count, bool $isAll): string {
+        $this->missingBulkAuthorizationFailureNotificationMessage(function (int $failureCount, int $totalCount): string {
             return trans_choice(
-                $isAll
+                ($failureCount === $totalCount)
                     ? 'filament-actions::force-delete.multiple.notifications.deleted_none.missing_authorization_failure_message'
                     : 'filament-actions::force-delete.multiple.notifications.deleted_partial.missing_authorization_failure_message',
-                $count,
-                ['count' => Number::format($count)],
+                $failureCount,
+                ['count' => Number::format($failureCount)],
             );
         });
 
-        $this->missingBulkProcessingFailureNotificationMessage(function (int $count, bool $isAll): string {
+        $this->missingBulkProcessingFailureNotificationMessage(function (int $failureCount, int $totalCount): string {
             return trans_choice(
-                $isAll
+                ($failureCount === $totalCount)
                     ? 'filament-actions::force-delete.multiple.notifications.deleted_none.missing_processing_failure_message'
                     : 'filament-actions::force-delete.multiple.notifications.deleted_partial.missing_processing_failure_message',
-                $count,
-                ['count' => Number::format($count)],
+                $failureCount,
+                ['count' => Number::format($failureCount)],
             );
         });
 

Diff for: packages/actions/src/RestoreBulkAction.php

@@ -47,23 +47,23 @@ protected function setUp(): void
             ]);
         });
 
-        $this->missingBulkAuthorizationFailureNotificationMessage(function (int $count, bool $isAll): string {
+        $this->missingBulkAuthorizationFailureNotificationMessage(function (int $failureCount, int $totalCount): string {
             return trans_choice(
-                $isAll
+                ($failureCount === $totalCount)
                     ? 'filament-actions::restore.multiple.notifications.restored_none.missing_authorization_failure_message'
                     : 'filament-actions::restore.multiple.notifications.restored_partial.missing_authorization_failure_message',
-                $count,
-                ['count' => Number::format($count)],
+                $failureCount,
+                ['count' => Number::format($failureCount)],
             );
         });
 
-        $this->missingBulkProcessingFailureNotificationMessage(function (int $count, bool $isAll): string {
+        $this->missingBulkProcessingFailureNotificationMessage(function (int $failureCount, int $totalCount): string {
             return trans_choice(
-                $isAll
+                ($failureCount === $totalCount)
                     ? 'filament-actions::restore.multiple.notifications.restored_none.missing_processing_failure_message'
                     : 'filament-actions::restore.multiple.notifications.restored_partial.missing_processing_failure_message',
-                $count,
-                ['count' => Number::format($count)],
+                $failureCount,
+                ['count' => Number::format($failureCount)],
             );
         });
 

Diff for: packages/support/src/Authorization/Denial.php

@@ -50,8 +50,10 @@ public function message(int $count = 1, int $total = 1): ?string
         if ($this->getMessageUsing) {
             return app()->call($this->getMessageUsing, [
                 'count' => $count,
+                'failureCount' => $count,
                 'isAll' => $count === $total,
                 'total' => $total,
+                'totalCount' => $total,
             ])
                 ?? parent::message()
                 ?? (($count === 1) && ($total === 1)