improve messages

Author: andrewminion-luminfire

src/Commands/LaravelQueueCancelBatchCommand.php

@@ -27,7 +27,7 @@ public function handle(): int
         if ($this->argument('batchUuids')) {
             $this->batches = collect($this->argument('batchUuids'));
         } else {
-            $batches = collect($batchRepository->get(100, null))->reject(fn (Batch $batch) => $batch->pendingJobs < 1 || $batch->finished() || $batch->canceled());
+            $allBatches = collect($batchRepository->get(100, null))->reject(fn (Batch $batch) => $batch->pendingJobs < 1 || $batch->finished() || $batch->canceled());
 
             if ($allBatches->isEmpty()) {
                 $this->info('There are no active batches.');
@@ -37,8 +37,8 @@ public function handle(): int
 
             /** @var array<int, string> */
             $batchIds = multiselect(
-                label: 'Select one or more batches to cancel',
-                options: $batches->mapWithKeys(fn (Batch $batch) => [$batch->id => sprintf(
+                label: 'Select one or more batches to cancel:',
+                options: $allBatches->mapWithKeys(fn (Batch $batch) => [$batch->id => sprintf(
                     '%s (%d/%d completed jobs; started %s)',
                     $batch->name,
                     $batch->pendingJobs,
@@ -51,7 +51,7 @@ public function handle(): int
         }
 
         if ($this->batches->isEmpty()) {
-            $this->info('No batches to cancel');
+            $this->info('There are no active batches.');
 
             return self::INVALID;
         }

tests/LaravelQueueCancelBatchCommandTest.php

@@ -101,7 +101,7 @@
 
     artisan(LaravelQueueCancelBatchCommand::class)
         ->expectsQuestion(
-            question: 'Select one or more batches to cancel',
+            question: 'Select one or more batches to cancel:',
             answer: [$testBatch2->id, $testBatch3->id],
         )
         ->assertSuccessful();