[10.x] Add resume method to batched jobs as an option

src/Illuminate/Bus/Batch.php

@@ -386,6 +386,16 @@ public function cancel()
         $this->repository->cancel($this->id);
     }
 
+    /**
+     * Resume the batch.
+     *
+     * @return void
+     */
+    public function resume()
+    {
+        $this->repository->resume($this->id);
+    }
+
     /**
      * Determine if the batch has been cancelled.
      *

src/Illuminate/Bus/BatchRepository.php

@@ -77,6 +77,14 @@ public function markAsFinished(string $batchId);
      */
     public function cancel(string $batchId);
 
+    /**
+     * Resume the batch that has the given ID.
+     *
+     * @param  string  $batchId
+     * @return void
+     */
+    public function resume(string $batchId);
+
     /**
      * Delete the batch that has the given ID.
      *

src/Illuminate/Bus/DatabaseBatchRepository.php

@@ -221,6 +221,20 @@ public function cancel(string $batchId)
         ]);
     }
 
+    /**
+     * Resume the batch that has the given ID.
+     *
+     * @param  string  $batchId
+     * @return void
+     */
+    public function resume(string $batchId)
+    {
+        $this->connection->table($this->table)->where('id', $batchId)->update([
+            'cancelled_at' => null,
+            'finished_at' => null,
+        ]);
+    }
+
     /**
      * Delete the batch that has the given ID.
      *

src/Illuminate/Queue/Console/RetryBatchCommand.php

@@ -15,7 +15,9 @@ class RetryBatchCommand extends Command implements Isolatable
      *
      * @var string
      */
-    protected $signature = 'queue:retry-batch {id : The ID of the batch whose failed jobs should be retried}';
+    protected $signature = 'queue:retry-batch
+                            {id : The ID of the batch whose failed jobs should be retried}
+                            {--resume : If the batch was previously cancelled, this will un-cancel the batch}';
 
     /**
      * The console command description.
@@ -43,6 +45,11 @@ public function handle()
             return 1;
         }
 
+        if ($this->option('resume')) {
+            $this->components->info("Resuming job batch [$id].");
+            $batch->resume();
+        }
+
         $this->components->info("Pushing failed queue jobs of the batch [$id] back onto the queue.");
 
         foreach ($batch->failedJobIds as $failedJobId) {

src/Illuminate/Support/Testing/Fakes/BatchRepositoryFake.php

@@ -129,6 +129,19 @@ public function cancel(string $batchId)
         }
     }
 
+    /**
+     * Resume the batch that has the given ID.
+     *
+     * @param  string  $batchId
+     * @return void
+     */
+    public function resume(string $batchId)
+    {
+        if (isset($this->batches[$batchId])) {
+            $this->batches[$batchId]->resume();
+        }
+    }
+
     /**
      * Delete the batch that has the given ID.
      *

tests/Bus/BusBatchTest.php

@@ -304,6 +304,23 @@ public function test_batch_can_be_cancelled()
         $this->assertTrue($batch->cancelled());
     }
 
+    public function test_batch_can_be_resumed()
+    {
+        $queue = m::mock(Factory::class);
+
+        $batch = $this->createTestBatch($queue);
+
+        $batch->cancel();
+
+        $batch = $batch->fresh();
+
+        $batch->resume();
+
+        $batch = $batch->fresh();
+
+        $this->assertFalse($batch->cancelled());
+    }
+
     public function test_batch_can_be_deleted()
     {
         $queue = m::mock(Factory::class);